From 7052dbec5d4b527928a496a1ade99ebc8ca66afb Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Fri, 30 Dec 2016 13:31:10 +0300
Subject: [PATCH] Fixed, Sector Edit window, UDMF: fixed some incorrect
tooltips.
---
.../Controls/ColorFieldsControl.Designer.cs | 4 ++
Source/Core/Controls/ColorFieldsControl.resx | 3 +
.../Controls/PairedFieldsControl.Designer.cs | 15 ++++-
Source/Core/Controls/PairedFieldsControl.resx | 3 +
.../Controls/PairedFloatControl.Designer.cs | 15 ++++-
Source/Core/Controls/PairedFloatControl.resx | 6 ++
.../Controls/PairedIntControl.Designer.cs | 14 ++++-
Source/Core/Controls/PairedIntControl.resx | 3 +
Source/Core/Windows/LinedefEditForm.cs | 12 ----
.../Windows/LinedefEditFormUDMF.Designer.cs | 23 +++++++-
Source/Core/Windows/LinedefEditFormUDMF.cs | 52 +++--------------
.../Windows/SectorEditFormUDMF.Designer.cs | 58 ++++++++++---------
Source/Core/Windows/SectorEditFormUDMF.cs | 10 ----
.../Windows/ThingEditFormUDMF.Designer.cs | 32 ++++++++--
Source/Core/Windows/ThingEditFormUDMF.cs | 12 +++-
15 files changed, 154 insertions(+), 108 deletions(-)
diff --git a/Source/Core/Controls/ColorFieldsControl.Designer.cs b/Source/Core/Controls/ColorFieldsControl.Designer.cs
index 12381ac96..577d3b87e 100644
--- a/Source/Core/Controls/ColorFieldsControl.Designer.cs
+++ b/Source/Core/Controls/ColorFieldsControl.Designer.cs
@@ -28,9 +28,11 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.bReset = new System.Windows.Forms.Button();
this.cpColor = new CodeImp.DoomBuilder.Controls.ColorControl();
this.tbColor = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+ this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout();
//
// bReset
@@ -40,6 +42,7 @@
this.bReset.Name = "bReset";
this.bReset.Size = new System.Drawing.Size(23, 23);
this.bReset.TabIndex = 43;
+ this.tooltip.SetToolTip(this.bReset, "Reset");
this.bReset.UseVisualStyleBackColor = true;
this.bReset.Visible = false;
this.bReset.Click += new System.EventHandler(this.bReset_Click);
@@ -83,5 +86,6 @@
private System.Windows.Forms.Button bReset;
private CodeImp.DoomBuilder.Controls.ColorControl cpColor;
private CodeImp.DoomBuilder.Controls.AutoSelectTextbox tbColor;
+ private System.Windows.Forms.ToolTip tooltip;
}
}
diff --git a/Source/Core/Controls/ColorFieldsControl.resx b/Source/Core/Controls/ColorFieldsControl.resx
index ff31a6db5..f991e2b7b 100644
--- a/Source/Core/Controls/ColorFieldsControl.resx
+++ b/Source/Core/Controls/ColorFieldsControl.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/PairedFieldsControl.Designer.cs b/Source/Core/Controls/PairedFieldsControl.Designer.cs
index 467e23bc2..26c504c24 100644
--- a/Source/Core/Controls/PairedFieldsControl.Designer.cs
+++ b/Source/Core/Controls/PairedFieldsControl.Designer.cs
@@ -28,10 +28,12 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.bReset = new System.Windows.Forms.Button();
this.bLink = new System.Windows.Forms.Button();
this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+ this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout();
//
// bReset
@@ -41,6 +43,7 @@
this.bReset.Name = "bReset";
this.bReset.Size = new System.Drawing.Size(23, 23);
this.bReset.TabIndex = 40;
+ this.tooltip.SetToolTip(this.bReset, "Reset");
this.bReset.UseVisualStyleBackColor = true;
this.bReset.Visible = false;
this.bReset.Click += new System.EventHandler(this.bReset_Click);
@@ -52,17 +55,21 @@
this.bLink.Name = "bLink";
this.bLink.Size = new System.Drawing.Size(23, 23);
this.bLink.TabIndex = 39;
+ this.tooltip.SetToolTip(this.bLink, "Link values");
this.bLink.UseVisualStyleBackColor = true;
this.bLink.Click += new System.EventHandler(this.bLink_Click);
//
// value1
//
this.value1.AllowDecimal = false;
+ this.value1.AllowExpressions = true;
this.value1.AllowNegative = true;
this.value1.AllowRelative = true;
- this.value1.AllowExpressions = true;
this.value1.ButtonStep = 1;
+ this.value1.ButtonStepBig = 10F;
this.value1.ButtonStepFloat = 1F;
+ this.value1.ButtonStepSmall = 0.1F;
+ this.value1.ButtonStepsUseModifierKeys = false;
this.value1.ButtonStepsWrapAround = false;
this.value1.Location = new System.Drawing.Point(3, 1);
this.value1.Name = "value1";
@@ -75,11 +82,14 @@
// value2
//
this.value2.AllowDecimal = false;
+ this.value2.AllowExpressions = true;
this.value2.AllowNegative = true;
this.value2.AllowRelative = true;
- this.value2.AllowExpressions = true;
this.value2.ButtonStep = 1;
+ this.value2.ButtonStepBig = 10F;
this.value2.ButtonStepFloat = 1F;
+ this.value2.ButtonStepSmall = 0.1F;
+ this.value2.ButtonStepsUseModifierKeys = false;
this.value2.ButtonStepsWrapAround = false;
this.value2.Location = new System.Drawing.Point(71, 1);
this.value2.Name = "value2";
@@ -109,5 +119,6 @@
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value1;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value2;
private System.Windows.Forms.Button bReset;
+ private System.Windows.Forms.ToolTip tooltip;
}
}
diff --git a/Source/Core/Controls/PairedFieldsControl.resx b/Source/Core/Controls/PairedFieldsControl.resx
index ff31a6db5..f991e2b7b 100644
--- a/Source/Core/Controls/PairedFieldsControl.resx
+++ b/Source/Core/Controls/PairedFieldsControl.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/PairedFloatControl.Designer.cs b/Source/Core/Controls/PairedFloatControl.Designer.cs
index 88f04dfce..87039237e 100644
--- a/Source/Core/Controls/PairedFloatControl.Designer.cs
+++ b/Source/Core/Controls/PairedFloatControl.Designer.cs
@@ -28,20 +28,25 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.bReset = new System.Windows.Forms.Button();
this.bLink = new System.Windows.Forms.Button();
+ this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout();
//
// value1
//
this.value1.AllowDecimal = true;
+ this.value1.AllowExpressions = true;
this.value1.AllowNegative = true;
this.value1.AllowRelative = true;
- this.value1.AllowExpressions = true;
this.value1.ButtonStep = 1;
+ this.value1.ButtonStepBig = 10F;
this.value1.ButtonStepFloat = 1F;
+ this.value1.ButtonStepSmall = 0.1F;
+ this.value1.ButtonStepsUseModifierKeys = false;
this.value1.ButtonStepsWrapAround = false;
this.value1.Location = new System.Drawing.Point(2, 1);
this.value1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
@@ -55,11 +60,14 @@
// value2
//
this.value2.AllowDecimal = true;
+ this.value2.AllowExpressions = true;
this.value2.AllowNegative = true;
this.value2.AllowRelative = true;
- this.value2.AllowExpressions = true;
this.value2.ButtonStep = 1;
+ this.value2.ButtonStepBig = 10F;
this.value2.ButtonStepFloat = 1F;
+ this.value2.ButtonStepSmall = 0.1F;
+ this.value2.ButtonStepsUseModifierKeys = false;
this.value2.ButtonStepsWrapAround = false;
this.value2.Location = new System.Drawing.Point(71, 1);
this.value2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
@@ -78,6 +86,7 @@
this.bReset.Name = "bReset";
this.bReset.Size = new System.Drawing.Size(23, 23);
this.bReset.TabIndex = 45;
+ this.tooltip.SetToolTip(this.bReset, "Reset");
this.bReset.UseVisualStyleBackColor = true;
this.bReset.Visible = false;
this.bReset.Click += new System.EventHandler(this.bReset_Click);
@@ -90,6 +99,7 @@
this.bLink.Name = "bLink";
this.bLink.Size = new System.Drawing.Size(23, 23);
this.bLink.TabIndex = 44;
+ this.tooltip.SetToolTip(this.bLink, "Link values");
this.bLink.UseVisualStyleBackColor = true;
this.bLink.Click += new System.EventHandler(this.bLink_Click);
//
@@ -114,5 +124,6 @@
private System.Windows.Forms.Button bLink;
private DoomBuilder.Controls.ButtonsNumericTextbox value1;
private DoomBuilder.Controls.ButtonsNumericTextbox value2;
+ private System.Windows.Forms.ToolTip tooltip;
}
}
diff --git a/Source/Core/Controls/PairedFloatControl.resx b/Source/Core/Controls/PairedFloatControl.resx
index 5ea0895e3..853abdf80 100644
--- a/Source/Core/Controls/PairedFloatControl.resx
+++ b/Source/Core/Controls/PairedFloatControl.resx
@@ -117,4 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/PairedIntControl.Designer.cs b/Source/Core/Controls/PairedIntControl.Designer.cs
index 7ab219d07..b2dabacdf 100644
--- a/Source/Core/Controls/PairedIntControl.Designer.cs
+++ b/Source/Core/Controls/PairedIntControl.Designer.cs
@@ -28,9 +28,11 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.bReset = new System.Windows.Forms.Button();
this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+ this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout();
//
// bReset
@@ -40,6 +42,7 @@
this.bReset.Name = "bReset";
this.bReset.Size = new System.Drawing.Size(23, 23);
this.bReset.TabIndex = 43;
+ this.tooltip.SetToolTip(this.bReset, "Reset");
this.bReset.UseVisualStyleBackColor = true;
this.bReset.Visible = false;
this.bReset.Click += new System.EventHandler(this.bReset_Click);
@@ -47,11 +50,14 @@
// value1
//
this.value1.AllowDecimal = false;
+ this.value1.AllowExpressions = true;
this.value1.AllowNegative = true;
this.value1.AllowRelative = true;
- this.value1.AllowExpressions = true;
this.value1.ButtonStep = 1;
+ this.value1.ButtonStepBig = 10F;
this.value1.ButtonStepFloat = 1F;
+ this.value1.ButtonStepSmall = 0.1F;
+ this.value1.ButtonStepsUseModifierKeys = false;
this.value1.ButtonStepsWrapAround = false;
this.value1.Location = new System.Drawing.Point(3, 1);
this.value1.Name = "value1";
@@ -64,11 +70,14 @@
// value2
//
this.value2.AllowDecimal = false;
+ this.value2.AllowExpressions = true;
this.value2.AllowNegative = true;
this.value2.AllowRelative = true;
- this.value2.AllowExpressions = true;
this.value2.ButtonStep = 1;
+ this.value2.ButtonStepBig = 10F;
this.value2.ButtonStepFloat = 1F;
+ this.value2.ButtonStepSmall = 0.1F;
+ this.value2.ButtonStepsUseModifierKeys = false;
this.value2.ButtonStepsWrapAround = false;
this.value2.Location = new System.Drawing.Point(71, 1);
this.value2.Name = "value2";
@@ -96,5 +105,6 @@
private System.Windows.Forms.Button bReset;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value1;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value2;
+ private System.Windows.Forms.ToolTip tooltip;
}
}
diff --git a/Source/Core/Controls/PairedIntControl.resx b/Source/Core/Controls/PairedIntControl.resx
index ff31a6db5..f991e2b7b 100644
--- a/Source/Core/Controls/PairedIntControl.resx
+++ b/Source/Core/Controls/PairedIntControl.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditForm.cs b/Source/Core/Windows/LinedefEditForm.cs
index ebdb44840..a159ee6fe 100644
--- a/Source/Core/Windows/LinedefEditForm.cs
+++ b/Source/Core/Windows/LinedefEditForm.cs
@@ -334,16 +334,6 @@ namespace CodeImp.DoomBuilder.Windows
argscontrol.UpdateScriptControls(); //mxd
actionhelp.UpdateAction(action.GetValue()); //mxd
-
- //mxd. Update some labels
- if(frontside.CheckState != CheckState.Unchecked)
- {
- labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
- }
- if(backside.CheckState != CheckState.Unchecked)
- {
- labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
- }
}
//mxd
@@ -771,7 +761,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -801,7 +790,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
index 2c38ab769..f86c818fd 100644
--- a/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
@@ -124,6 +124,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.imagelist = new System.Windows.Forms.ImageList(this.components);
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+ this.resetalpha = new System.Windows.Forms.Button();
label2 = new System.Windows.Forms.Label();
label11 = new System.Windows.Forms.Label();
label12 = new System.Windows.Forms.Label();
@@ -182,7 +183,7 @@ namespace CodeImp.DoomBuilder.Windows
// label6
//
label6.AutoSize = true;
- label6.Location = new System.Drawing.Point(199, 21);
+ label6.Location = new System.Drawing.Point(189, 21);
label6.Name = "label6";
label6.Size = new System.Drawing.Size(37, 13);
label6.TabIndex = 17;
@@ -374,6 +375,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.groupsettings.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.groupsettings.Controls.Add(this.resetalpha);
this.groupsettings.Controls.Add(this.lockpick);
this.groupsettings.Controls.Add(this.alpha);
this.groupsettings.Controls.Add(label6);
@@ -398,6 +400,7 @@ namespace CodeImp.DoomBuilder.Windows
// alpha
//
this.alpha.AllowDecimal = true;
+ this.alpha.AllowExpressions = false;
this.alpha.AllowNegative = false;
this.alpha.AllowRelative = false;
this.alpha.ButtonStep = 1;
@@ -406,7 +409,7 @@ namespace CodeImp.DoomBuilder.Windows
this.alpha.ButtonStepSmall = 0.01F;
this.alpha.ButtonStepsUseModifierKeys = true;
this.alpha.ButtonStepsWrapAround = false;
- this.alpha.Location = new System.Drawing.Point(243, 16);
+ this.alpha.Location = new System.Drawing.Point(233, 16);
this.alpha.Name = "alpha";
this.alpha.Size = new System.Drawing.Size(65, 24);
this.alpha.StepValues = null;
@@ -793,6 +796,7 @@ namespace CodeImp.DoomBuilder.Windows
// frontsector
//
this.frontsector.AllowDecimal = false;
+ this.frontsector.AllowExpressions = false;
this.frontsector.AllowNegative = false;
this.frontsector.AllowRelative = false;
this.frontsector.ButtonStep = 1;
@@ -820,6 +824,7 @@ namespace CodeImp.DoomBuilder.Windows
// lightFront
//
this.lightFront.AllowDecimal = false;
+ this.lightFront.AllowExpressions = false;
this.lightFront.AllowNegative = true;
this.lightFront.AllowRelative = true;
this.lightFront.ButtonStep = 16;
@@ -955,6 +960,7 @@ namespace CodeImp.DoomBuilder.Windows
// backsector
//
this.backsector.AllowDecimal = false;
+ this.backsector.AllowExpressions = false;
this.backsector.AllowNegative = false;
this.backsector.AllowRelative = false;
this.backsector.ButtonStep = 1;
@@ -982,6 +988,7 @@ namespace CodeImp.DoomBuilder.Windows
// lightBack
//
this.lightBack.AllowDecimal = false;
+ this.lightBack.AllowExpressions = false;
this.lightBack.AllowNegative = true;
this.lightBack.AllowRelative = true;
this.lightBack.ButtonStep = 1;
@@ -1367,6 +1374,17 @@ namespace CodeImp.DoomBuilder.Windows
this.imagelist.Images.SetKeyName(0, "Check.png");
this.imagelist.Images.SetKeyName(1, "SearchClear.png");
//
+ // resetalpha
+ //
+ this.resetalpha.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+ this.resetalpha.Location = new System.Drawing.Point(301, 16);
+ this.resetalpha.Name = "resetalpha";
+ this.resetalpha.Size = new System.Drawing.Size(23, 23);
+ this.resetalpha.TabIndex = 70;
+ this.tooltip.SetToolTip(this.resetalpha, "Reset");
+ this.resetalpha.UseVisualStyleBackColor = true;
+ this.resetalpha.Click += new System.EventHandler(this.resetalpha_Click);
+ //
// LinedefEditFormUDMF
//
this.AcceptButton = this.apply;
@@ -1512,5 +1530,6 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.TagsSelector tagsselector;
private System.Windows.Forms.Button resetfrontlight;
private System.Windows.Forms.Button resetbacklight;
+ private System.Windows.Forms.Button resetalpha;
}
}
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.cs b/Source/Core/Windows/LinedefEditFormUDMF.cs
index 3e091c9ac..67c3c10de 100644
--- a/Source/Core/Windows/LinedefEditFormUDMF.cs
+++ b/Source/Core/Windows/LinedefEditFormUDMF.cs
@@ -558,37 +558,10 @@ namespace CodeImp.DoomBuilder.Windows
actionhelp.UpdateAction(action.GetValue()); //mxd
commenteditor.FinishSetup(); //mxd
- //mxd. Update brightness reset buttons
+ //mxd. Update "Reset" buttons
resetfrontlight.Visible = (cbLightAbsoluteFront.CheckState != CheckState.Unchecked || lightFront.GetResult(0) != 0);
resetbacklight.Visible = (cbLightAbsoluteBack.CheckState != CheckState.Unchecked || lightBack.GetResult(0) != 0);
-
- //mxd. Update some labels
- if(frontside.CheckState != CheckState.Unchecked)
- {
- // Update Offset labels
- labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
- labelFrontOffsetTop.Enabled = pfcFrontOffsetTop.NonDefaultValue;
- labelFrontOffsetMid.Enabled = pfcFrontOffsetMid.NonDefaultValue;
- labelFrontOffsetBottom.Enabled = pfcFrontOffsetBottom.NonDefaultValue;
-
- // Update Scale labels
- labelFrontScaleTop.Enabled = pfcFrontScaleTop.NonDefaultValue;
- labelFrontScaleMid.Enabled = pfcFrontScaleMid.NonDefaultValue;
- labelFrontScaleBottom.Enabled = pfcFrontScaleBottom.NonDefaultValue;
- }
- if(backside.CheckState != CheckState.Unchecked)
- {
- // Update Offset labels
- labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
- labelBackOffsetTop.Enabled = pfcBackOffsetTop.NonDefaultValue;
- labelBackOffsetMid.Enabled = pfcBackOffsetMid.NonDefaultValue;
- labelBackOffsetBottom.Enabled = pfcBackOffsetBottom.NonDefaultValue;
-
- // Update Scale labels
- labelBackScaleTop.Enabled = pfcBackScaleTop.NonDefaultValue;
- labelBackScaleMid.Enabled = pfcBackScaleMid.NonDefaultValue;
- labelBackScaleBottom.Enabled = pfcBackScaleBottom.NonDefaultValue;
- }
+ if(alpha.Text == "1") resetalpha.Visible = false;
}
//mxd
@@ -883,10 +856,17 @@ namespace CodeImp.DoomBuilder.Windows
}
}
+ resetalpha.Visible = (alpha.GetResultFloat(1.0f) != 1.0f);
+
General.Map.IsChanged = true;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
+ private void resetalpha_Click(object sender, EventArgs e)
+ {
+ alpha.Text = "1";
+ }
+
private void flags_OnValueChanged(object sender, EventArgs e)
{
if(preventchanges) return;
@@ -1506,7 +1486,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1536,7 +1515,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1562,7 +1540,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontOffsetTop.Enabled = pfcFrontOffsetTop.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1585,7 +1562,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontOffsetMid.Enabled = pfcFrontOffsetMid.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1608,7 +1584,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontOffsetBottom.Enabled = pfcFrontOffsetBottom.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1631,7 +1606,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackOffsetTop.Enabled = pfcBackOffsetTop.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1654,7 +1628,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackOffsetMid.Enabled = pfcBackOffsetMid.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1677,7 +1650,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackOffsetBottom.Enabled = pfcBackOffsetBottom.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1704,7 +1676,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontScaleTop.Enabled = pfcFrontScaleTop.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1727,7 +1698,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontScaleMid.Enabled = pfcFrontScaleMid.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1750,7 +1720,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFrontScaleBottom.Enabled = pfcFrontScaleBottom.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1773,7 +1742,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackScaleTop.Enabled = pfcBackScaleTop.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1796,7 +1764,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackScaleMid.Enabled = pfcBackScaleMid.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1819,7 +1786,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelBackScaleBottom.Enabled = pfcBackScaleBottom.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
index 344a7c8ee..6e9f6cc9c 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
@@ -236,14 +236,14 @@
//
// fogdensity
//
- this.fogdensity.AllowDecimal = true;
+ this.fogdensity.AllowDecimal = false;
this.fogdensity.AllowExpressions = false;
this.fogdensity.AllowNegative = false;
this.fogdensity.AllowRelative = false;
- this.fogdensity.ButtonStep = 1;
- this.fogdensity.ButtonStepBig = 0.25F;
- this.fogdensity.ButtonStepFloat = 0.1F;
- this.fogdensity.ButtonStepSmall = 0.01F;
+ this.fogdensity.ButtonStep = 8;
+ this.fogdensity.ButtonStepBig = 16F;
+ this.fogdensity.ButtonStepFloat = 1F;
+ this.fogdensity.ButtonStepSmall = 1F;
this.fogdensity.ButtonStepsUseModifierKeys = true;
this.fogdensity.ButtonStepsWrapAround = false;
this.fogdensity.Location = new System.Drawing.Point(89, 132);
@@ -283,6 +283,7 @@
this.resetsoundsequence.Size = new System.Drawing.Size(28, 25);
this.resetsoundsequence.TabIndex = 13;
this.resetsoundsequence.Text = " ";
+ this.tooltip.SetToolTip(this.resetsoundsequence, "Reset");
this.resetsoundsequence.UseVisualStyleBackColor = true;
this.resetsoundsequence.Click += new System.EventHandler(this.resetsoundsequence_Click);
//
@@ -701,6 +702,7 @@
this.resetdamagetype.Size = new System.Drawing.Size(28, 25);
this.resetdamagetype.TabIndex = 2;
this.resetdamagetype.Text = " ";
+ this.tooltip.SetToolTip(this.resetdamagetype, "Reset");
this.resetdamagetype.UseVisualStyleBackColor = true;
this.resetdamagetype.Click += new System.EventHandler(this.resetdamagetype_Click);
//
@@ -823,7 +825,7 @@
this.resetfloorglowheight.Name = "resetfloorglowheight";
this.resetfloorglowheight.Size = new System.Drawing.Size(23, 23);
this.resetfloorglowheight.TabIndex = 24;
- this.tooltip.SetToolTip(this.resetfloorglowheight, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.resetfloorglowheight, "Reset");
this.resetfloorglowheight.UseVisualStyleBackColor = true;
this.resetfloorglowheight.Click += new System.EventHandler(this.resetfloorglowheight_Click);
//
@@ -843,10 +845,10 @@
this.floorglowheight.AllowExpressions = false;
this.floorglowheight.AllowNegative = false;
this.floorglowheight.AllowRelative = false;
- this.floorglowheight.ButtonStep = 1;
- this.floorglowheight.ButtonStepBig = 0.25F;
- this.floorglowheight.ButtonStepFloat = 0.1F;
- this.floorglowheight.ButtonStepSmall = 0.01F;
+ this.floorglowheight.ButtonStep = 8;
+ this.floorglowheight.ButtonStepBig = 16F;
+ this.floorglowheight.ButtonStepFloat = 1F;
+ this.floorglowheight.ButtonStepSmall = 1F;
this.floorglowheight.ButtonStepsUseModifierKeys = true;
this.floorglowheight.ButtonStepsWrapAround = false;
this.floorglowheight.Location = new System.Drawing.Point(113, 254);
@@ -875,7 +877,7 @@
this.reset_floor_reflect.Name = "reset_floor_reflect";
this.reset_floor_reflect.Size = new System.Drawing.Size(23, 23);
this.reset_floor_reflect.TabIndex = 19;
- this.tooltip.SetToolTip(this.reset_floor_reflect, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.reset_floor_reflect, "Reset");
this.reset_floor_reflect.UseVisualStyleBackColor = true;
this.reset_floor_reflect.Click += new System.EventHandler(this.reset_floor_reflect_Click);
//
@@ -917,6 +919,7 @@
this.resetfloorterrain.Size = new System.Drawing.Size(23, 23);
this.resetfloorterrain.TabIndex = 8;
this.resetfloorterrain.Text = " ";
+ this.tooltip.SetToolTip(this.resetfloorterrain, "Reset");
this.resetfloorterrain.UseVisualStyleBackColor = true;
this.resetfloorterrain.Click += new System.EventHandler(this.resetfloorterrain_Click);
//
@@ -947,7 +950,7 @@
this.resetfloorlight.Name = "resetfloorlight";
this.resetfloorlight.Size = new System.Drawing.Size(23, 23);
this.resetfloorlight.TabIndex = 12;
- this.tooltip.SetToolTip(this.resetfloorlight, "Reset Floor Brightness");
+ this.tooltip.SetToolTip(this.resetfloorlight, "Reset");
this.resetfloorlight.UseVisualStyleBackColor = true;
this.resetfloorlight.Click += new System.EventHandler(this.resetfloorlight_Click);
//
@@ -985,7 +988,7 @@
//
// floorAngleControl
//
- this.floorAngleControl.Angle = -1440;
+ this.floorAngleControl.Angle = -1710;
this.floorAngleControl.AngleOffset = 90;
this.floorAngleControl.DoomAngleClamping = false;
this.floorAngleControl.Location = new System.Drawing.Point(6, 156);
@@ -1188,7 +1191,7 @@
this.resetceilingglowheight.Name = "resetceilingglowheight";
this.resetceilingglowheight.Size = new System.Drawing.Size(23, 23);
this.resetceilingglowheight.TabIndex = 24;
- this.tooltip.SetToolTip(this.resetceilingglowheight, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.resetceilingglowheight, "Reset");
this.resetceilingglowheight.UseVisualStyleBackColor = true;
this.resetceilingglowheight.Click += new System.EventHandler(this.resetceilingglowheight_Click);
//
@@ -1208,10 +1211,10 @@
this.ceilingglowheight.AllowExpressions = false;
this.ceilingglowheight.AllowNegative = false;
this.ceilingglowheight.AllowRelative = false;
- this.ceilingglowheight.ButtonStep = 1;
- this.ceilingglowheight.ButtonStepBig = 0.25F;
- this.ceilingglowheight.ButtonStepFloat = 0.1F;
- this.ceilingglowheight.ButtonStepSmall = 0.01F;
+ this.ceilingglowheight.ButtonStep = 8;
+ this.ceilingglowheight.ButtonStepBig = 16F;
+ this.ceilingglowheight.ButtonStepFloat = 1F;
+ this.ceilingglowheight.ButtonStepSmall = 1F;
this.ceilingglowheight.ButtonStepsUseModifierKeys = true;
this.ceilingglowheight.ButtonStepsWrapAround = false;
this.ceilingglowheight.Location = new System.Drawing.Point(113, 254);
@@ -1240,7 +1243,7 @@
this.reset_ceiling_reflect.Name = "reset_ceiling_reflect";
this.reset_ceiling_reflect.Size = new System.Drawing.Size(23, 23);
this.reset_ceiling_reflect.TabIndex = 19;
- this.tooltip.SetToolTip(this.reset_ceiling_reflect, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.reset_ceiling_reflect, "Reset");
this.reset_ceiling_reflect.UseVisualStyleBackColor = true;
this.reset_ceiling_reflect.Click += new System.EventHandler(this.reset_ceiling_reflect_Click);
//
@@ -1282,6 +1285,7 @@
this.resetceilterrain.Size = new System.Drawing.Size(23, 23);
this.resetceilterrain.TabIndex = 8;
this.resetceilterrain.Text = " ";
+ this.tooltip.SetToolTip(this.resetceilterrain, "Reset");
this.resetceilterrain.UseVisualStyleBackColor = true;
this.resetceilterrain.Click += new System.EventHandler(this.resetceilterrain_Click);
//
@@ -1312,7 +1316,7 @@
this.resetceillight.Name = "resetceillight";
this.resetceillight.Size = new System.Drawing.Size(23, 23);
this.resetceillight.TabIndex = 12;
- this.tooltip.SetToolTip(this.resetceillight, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.resetceillight, "Reset");
this.resetceillight.UseVisualStyleBackColor = true;
this.resetceillight.Click += new System.EventHandler(this.resetceillight_Click);
//
@@ -1350,7 +1354,7 @@
//
// ceilAngleControl
//
- this.ceilAngleControl.Angle = -1440;
+ this.ceilAngleControl.Angle = -1710;
this.ceilAngleControl.AngleOffset = 90;
this.ceilAngleControl.DoomAngleClamping = false;
this.ceilAngleControl.Location = new System.Drawing.Point(6, 156);
@@ -1534,7 +1538,7 @@
this.resetalphafloor.Name = "resetalphafloor";
this.resetalphafloor.Size = new System.Drawing.Size(23, 23);
this.resetalphafloor.TabIndex = 70;
- this.tooltip.SetToolTip(this.resetalphafloor, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.resetalphafloor, "Reset");
this.resetalphafloor.UseVisualStyleBackColor = true;
this.resetalphafloor.Click += new System.EventHandler(this.resetalphafloor_Click);
//
@@ -1545,9 +1549,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.floorportalflags.AutoScroll = true;
this.floorportalflags.Columns = 2;
- this.floorportalflags.Location = new System.Drawing.Point(6, 79);
+ this.floorportalflags.Location = new System.Drawing.Point(9, 79);
this.floorportalflags.Name = "floorportalflags";
- this.floorportalflags.Size = new System.Drawing.Size(181, 201);
+ this.floorportalflags.Size = new System.Drawing.Size(178, 201);
this.floorportalflags.TabIndex = 59;
this.floorportalflags.VerticalSpacing = 1;
//
@@ -1622,7 +1626,7 @@
this.resetalphaceiling.Name = "resetalphaceiling";
this.resetalphaceiling.Size = new System.Drawing.Size(23, 23);
this.resetalphaceiling.TabIndex = 68;
- this.tooltip.SetToolTip(this.resetalphaceiling, "Reset Ceiling Brightness");
+ this.tooltip.SetToolTip(this.resetalphaceiling, "Reset");
this.resetalphaceiling.UseVisualStyleBackColor = true;
this.resetalphaceiling.Click += new System.EventHandler(this.resetalphaceiling_Click);
//
@@ -1633,9 +1637,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.ceilportalflags.AutoScroll = true;
this.ceilportalflags.Columns = 2;
- this.ceilportalflags.Location = new System.Drawing.Point(6, 79);
+ this.ceilportalflags.Location = new System.Drawing.Point(9, 79);
this.ceilportalflags.Name = "ceilportalflags";
- this.ceilportalflags.Size = new System.Drawing.Size(181, 201);
+ this.ceilportalflags.Size = new System.Drawing.Size(178, 201);
this.ceilportalflags.TabIndex = 59;
this.ceilportalflags.VerticalSpacing = 1;
//
diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs
index d1416aac0..6fde394be 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.cs
@@ -597,12 +597,6 @@ namespace CodeImp.DoomBuilder.Windows
// Show sector height
UpdateSectorHeight();
- //mxd. Update some labels
- labelCeilOffsets.Enabled = ceilOffsets.NonDefaultValue;
- labelCeilScale.Enabled = ceilScale.NonDefaultValue;
- labelFloorOffsets.Enabled = floorOffsets.NonDefaultValue;
- labelFloorScale.Enabled = floorScale.NonDefaultValue;
-
//mxd. Update brightness reset buttons
resetceillight.Visible = (ceilLightAbsolute.CheckState != CheckState.Unchecked || ceilBrightness.GetResult(0) != 0);
resetfloorlight.Visible = (floorLightAbsolute.CheckState != CheckState.Unchecked || floorBrightness.GetResult(0) != 0);
@@ -1317,7 +1311,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelCeilOffsets.Enabled = ceilOffsets.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1333,7 +1326,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFloorOffsets.Enabled = floorOffsets.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1349,7 +1341,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelCeilScale.Enabled = ceilScale.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -1365,7 +1356,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelFloorScale.Enabled = floorScale.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
diff --git a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs
index 06a14c889..6948bbff3 100644
--- a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs
@@ -98,6 +98,7 @@
this.hint = new System.Windows.Forms.PictureBox();
this.hintlabel = new System.Windows.Forms.Label();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+ this.resetalpha = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabs.SuspendLayout();
@@ -193,9 +194,9 @@
// roll
//
this.roll.AllowDecimal = false;
+ this.roll.AllowExpressions = true;
this.roll.AllowNegative = true;
this.roll.AllowRelative = true;
- this.roll.AllowExpressions = true;
this.roll.ButtonStep = 5;
this.roll.ButtonStepBig = 15F;
this.roll.ButtonStepFloat = 1F;
@@ -221,9 +222,9 @@
// pitch
//
this.pitch.AllowDecimal = false;
+ this.pitch.AllowExpressions = true;
this.pitch.AllowNegative = true;
this.pitch.AllowRelative = true;
- this.pitch.AllowExpressions = true;
this.pitch.ButtonStep = 5;
this.pitch.ButtonStepBig = 15F;
this.pitch.ButtonStepFloat = 1F;
@@ -249,9 +250,9 @@
// angle
//
this.angle.AllowDecimal = false;
+ this.angle.AllowExpressions = true;
this.angle.AllowNegative = true;
this.angle.AllowRelative = true;
- this.angle.AllowExpressions = true;
this.angle.ButtonStep = 5;
this.angle.ButtonStepBig = 15F;
this.angle.ButtonStepFloat = 1F;
@@ -479,9 +480,9 @@
// posX
//
this.posX.AllowDecimal = true;
+ this.posX.AllowExpressions = true;
this.posX.AllowNegative = true;
this.posX.AllowRelative = true;
- this.posX.AllowExpressions = true;
this.posX.ButtonStep = 8;
this.posX.ButtonStepBig = 8F;
this.posX.ButtonStepFloat = 1F;
@@ -498,9 +499,9 @@
// posY
//
this.posY.AllowDecimal = true;
+ this.posY.AllowExpressions = true;
this.posY.AllowNegative = true;
this.posY.AllowRelative = true;
- this.posY.AllowExpressions = true;
this.posY.ButtonStep = 8;
this.posY.ButtonStepBig = 8F;
this.posY.ButtonStepFloat = 1F;
@@ -517,9 +518,9 @@
// posZ
//
this.posZ.AllowDecimal = true;
+ this.posZ.AllowExpressions = true;
this.posZ.AllowNegative = true;
this.posZ.AllowRelative = true;
- this.posZ.AllowExpressions = true;
this.posZ.ButtonStep = 8;
this.posZ.ButtonStepBig = 8F;
this.posZ.ButtonStepFloat = 1F;
@@ -579,6 +580,7 @@
// floatbobphase
//
this.floatbobphase.AllowDecimal = false;
+ this.floatbobphase.AllowExpressions = false;
this.floatbobphase.AllowNegative = true;
this.floatbobphase.AllowRelative = false;
this.floatbobphase.ButtonStep = 1;
@@ -605,6 +607,7 @@
// conversationID
//
this.conversationID.AllowDecimal = false;
+ this.conversationID.AllowExpressions = false;
this.conversationID.AllowNegative = false;
this.conversationID.AllowRelative = false;
this.conversationID.ButtonStep = 1;
@@ -631,6 +634,7 @@
// health
//
this.health.AllowDecimal = false;
+ this.health.AllowExpressions = false;
this.health.AllowNegative = true;
this.health.AllowRelative = false;
this.health.ButtonStep = 8;
@@ -661,6 +665,7 @@
// score
//
this.score.AllowDecimal = false;
+ this.score.AllowExpressions = false;
this.score.AllowNegative = false;
this.score.AllowRelative = false;
this.score.ButtonStep = 8;
@@ -687,6 +692,7 @@
// gravity
//
this.gravity.AllowDecimal = true;
+ this.gravity.AllowExpressions = false;
this.gravity.AllowNegative = true;
this.gravity.AllowRelative = false;
this.gravity.ButtonStep = 8;
@@ -703,6 +709,7 @@
//
// grouprendering
//
+ this.grouprendering.Controls.Add(this.resetalpha);
this.grouprendering.Controls.Add(this.labelScale);
this.grouprendering.Controls.Add(this.scale);
this.grouprendering.Controls.Add(this.color);
@@ -754,6 +761,7 @@
// alpha
//
this.alpha.AllowDecimal = true;
+ this.alpha.AllowExpressions = false;
this.alpha.AllowNegative = true;
this.alpha.AllowRelative = false;
this.alpha.ButtonStep = 8;
@@ -983,6 +991,17 @@
this.tooltip.InitialDelay = 10;
this.tooltip.ReshowDelay = 100;
//
+ // resetalpha
+ //
+ this.resetalpha.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+ this.resetalpha.Location = new System.Drawing.Point(166, 86);
+ this.resetalpha.Name = "resetalpha";
+ this.resetalpha.Size = new System.Drawing.Size(23, 23);
+ this.resetalpha.TabIndex = 69;
+ this.tooltip.SetToolTip(this.resetalpha, "Reset");
+ this.resetalpha.UseVisualStyleBackColor = true;
+ this.resetalpha.Click += new System.EventHandler(this.resetalpha_Click);
+ //
// ThingEditFormUDMF
//
this.AcceptButton = this.apply;
@@ -1107,5 +1126,6 @@
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floatbobphase;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox hidefixedfields;
+ private System.Windows.Forms.Button resetalpha;
}
}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditFormUDMF.cs b/Source/Core/Windows/ThingEditFormUDMF.cs
index 2d59a1e9c..561ee40c4 100644
--- a/Source/Core/Windows/ThingEditFormUDMF.cs
+++ b/Source/Core/Windows/ThingEditFormUDMF.cs
@@ -315,6 +315,9 @@ namespace CodeImp.DoomBuilder.Windows
preventchanges = false;
+ //mxd. Update "Reset" button
+ if(alpha.Text == "1") resetalpha.Visible = false;
+
//mxd. Trigger updates manually...
preventmapchange = true;
angle_WhenTextChanged(angle, EventArgs.Empty);
@@ -325,7 +328,6 @@ namespace CodeImp.DoomBuilder.Windows
argscontrol.UpdateScriptControls(); //mxd
actionhelp.UpdateAction(action.GetValue()); //mxd
- labelScale.Enabled = scale.NonDefaultValue; //mxd
commenteditor.FinishSetup(); //mxd
UpdateFlagNames(); //mxd
}
@@ -731,7 +733,6 @@ namespace CodeImp.DoomBuilder.Windows
}
General.Map.IsChanged = true;
- labelScale.Enabled = scale.NonDefaultValue;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
@@ -938,10 +939,17 @@ namespace CodeImp.DoomBuilder.Windows
}
}
+ resetalpha.Visible = (alpha.GetResultFloat(1.0f) != 1.0f);
+
General.Map.IsChanged = true;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
+ private void resetalpha_Click(object sender, EventArgs e)
+ {
+ alpha.Text = "1";
+ }
+
private void hidefixedfields_CheckedChanged(object sender, EventArgs e)
{
fieldslist.ShowFixedFields = !hidefixedfields.Checked;
--
GitLab