diff --git a/Build/Configurations/Includes/Hexen_linedefs.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg
index c850b4c7f93d602bcad9334d98bd09c02558e573..40293da57c70c6d934fd54dfe3a6b4f293ba3bc9 100644
--- a/Build/Configurations/Includes/Hexen_linedefs.cfg
+++ b/Build/Configurations/Includes/Hexen_linedefs.cfg
@@ -125,7 +125,7 @@ polyobj
6
{
- title = "Polyobj Move (8px)";
+ title = "Polyobj Move (* 8)";
arg0
{
@@ -144,7 +144,7 @@ polyobj
arg3
{
- title = "Movement Length (8px)";
+ title = "Movement Distance * 8";
}
}
@@ -270,7 +270,7 @@ polyobj
93
{
- title = "Polyobj Move (8px, override)";
+ title = "Polyobj Move (8mu, override)";
arg0
{
@@ -289,7 +289,7 @@ polyobj
arg3
{
- title = "Movement Length (8px)";
+ title = "Movement Distance * 8";
}
}
}
@@ -555,7 +555,7 @@ floor
35
{
- title = "Floor Raise (8px)";
+ title = "Floor Raise by Value * 8";
arg0
{
@@ -570,13 +570,13 @@ floor
arg2
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
36
{
- title = "Floor Lower (8px)";
+ title = "Floor Lower by Value * 8";
arg0
{
@@ -591,7 +591,7 @@ floor
arg2
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
@@ -608,7 +608,7 @@ floor
66
{
- title = "Floor Lower Instantly (8px)";
+ title = "Floor Lower Instantly by Value * 8";
arg0
{
@@ -618,13 +618,13 @@ floor
arg2
{
- title = "Target Height (8px)";
+ title = "Lower by (* 8)";
}
}
67
{
- title = "Floor Raise Instantly (8px)";
+ title = "Floor Raise Instantly by Value * 8";
arg0
{
@@ -634,13 +634,13 @@ floor
arg2
{
- title = "Target Height (8px)";
+ title = "Raise by (* 8)";
}
}
68
{
- title = "Floor Move (8px)";
+ title = "Floor Move to Value * 8";
arg0
{
@@ -655,7 +655,7 @@ floor
arg2
{
- title = "Target Height (8px)";
+ title = "Target Height * 8";
}
arg3
@@ -1026,7 +1026,7 @@ ceiling
69
{
- title = "Ceiling Move (8px)";
+ title = "Ceiling Move to Value * 8";
arg0
{
@@ -1041,7 +1041,7 @@ ceiling
arg2
{
- title = "Movement Amount (8px)";
+ title = "Target Height * 8";
}
arg3
@@ -1113,7 +1113,7 @@ platform
63
{
- title = "Platform Lower (8px)";
+ title = "Platform Lower by Value * 8";
arg0
{
@@ -1133,7 +1133,7 @@ platform
arg3
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
@@ -1160,7 +1160,7 @@ platform
65
{
- title = "Platform Raise (8px)";
+ title = "Platform Raise by Value * 8";
arg0
{
@@ -1180,7 +1180,7 @@ platform
arg3
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
}
diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg
index ca852819074e615bab98cd8b184c27cc40052285..93204b1f04ce8bfb3085272e55a50ec9ac720cb8 100644
--- a/Build/Configurations/Includes/ZDoom_linedefs.cfg
+++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg
@@ -1235,7 +1235,7 @@ zdoom
}
193
{
- title = "Ceiling Lower Instantly";
+ title = "Ceiling Lower Instantly by Value * 8";
arg0
{
@@ -1244,12 +1244,12 @@ zdoom
}
arg2
{
- title = "Movement Amount (8px)";
+ title = "Lower by (* 8)";
}
}
194
{
- title = "Ceiling Raise Instantly";
+ title = "Ceiling Raise Instantly by Value * 8";
arg0
{
@@ -1258,7 +1258,7 @@ zdoom
}
arg2
{
- title = "Movement Amount (8px)";
+ title = "Raise by (* 8)";
}
}
195
@@ -1344,7 +1344,7 @@ zdoom
}
198
{
- title = "Ceiling Raise (8px)";
+ title = "Ceiling Raise by Value * 8";
arg0
{
@@ -1357,12 +1357,12 @@ zdoom
}
arg2
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
199
{
- title = "Ceiling Lower (8px)";
+ title = "Ceiling Lower by Value * 8";
arg0
{
@@ -1375,7 +1375,7 @@ zdoom
}
arg2
{
- title = "Movement Amount (8px)";
+ title = "Movement Amount * 8";
}
}
@@ -1729,7 +1729,7 @@ zdoom
}
230
{
- title = "Platform Raise by Value Tx (8px)";
+ title = "Platform Raise by Value Tx (* 8)";
arg0
{
@@ -1742,7 +1742,7 @@ zdoom
}
arg2
{
- title = "Movement Amount";
+ title = "Movement Amount * 8";
}
}
231
diff --git a/Source/Core/Controls/CheckboxArrayControl.cs b/Source/Core/Controls/CheckboxArrayControl.cs
index 0077331db47e03d3240f49919dd72add1b23726f..ecf02d1a515d5f85edc5eaded4c62ec96f917999 100644
--- a/Source/Core/Controls/CheckboxArrayControl.cs
+++ b/Source/Core/Controls/CheckboxArrayControl.cs
@@ -68,6 +68,14 @@ namespace CodeImp.DoomBuilder.Controls
return c;
}
+ //mxd
+ public int GetHeight() {
+ if(columns < 1) return 0;
+ if(checkboxes.Count < 1) return 0;
+ int col = (int)Math.Ceiling((float)checkboxes.Count / (float)columns);
+ return col * checkboxes[0].Height + (col * SPACING_Y + SPACING_Y);
+ }
+
// This positions the checkboxes
public void PositionCheckboxes()
{
diff --git a/Source/Core/Windows/BitFlagsForm.Designer.cs b/Source/Core/Windows/BitFlagsForm.Designer.cs
index f4c4c0176f138d2be25876c7ba1b46408e2e50b4..03837e4258b0bdfb16f404a24b6dce0841a4d877 100644
--- a/Source/Core/Windows/BitFlagsForm.Designer.cs
+++ b/Source/Core/Windows/BitFlagsForm.Designer.cs
@@ -40,16 +40,16 @@ namespace CodeImp.DoomBuilder.Windows
| System.Windows.Forms.AnchorStyles.Right)));
this.options.AutoScroll = true;
this.options.Columns = 1;
- this.options.Location = new System.Drawing.Point(25, 21);
+ this.options.Location = new System.Drawing.Point(12, 12);
this.options.Name = "options";
- this.options.Size = new System.Drawing.Size(164, 158);
+ this.options.Size = new System.Drawing.Size(185, 170);
this.options.TabIndex = 0;
//
// cancel
//
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancel.Location = new System.Drawing.Point(106, 198);
+ this.cancel.Location = new System.Drawing.Point(106, 188);
this.cancel.Name = "cancel";
this.cancel.Size = new System.Drawing.Size(91, 25);
this.cancel.TabIndex = 2;
@@ -60,7 +60,7 @@ namespace CodeImp.DoomBuilder.Windows
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.apply.Location = new System.Drawing.Point(9, 198);
+ this.apply.Location = new System.Drawing.Point(12, 188);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(91, 25);
this.apply.TabIndex = 1;
@@ -74,7 +74,7 @@ namespace CodeImp.DoomBuilder.Windows
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.cancel;
- this.ClientSize = new System.Drawing.Size(206, 232);
+ this.ClientSize = new System.Drawing.Size(206, 218);
this.Controls.Add(this.cancel);
this.Controls.Add(this.apply);
this.Controls.Add(this.options);
diff --git a/Source/Core/Windows/BitFlagsForm.cs b/Source/Core/Windows/BitFlagsForm.cs
index db74461f47b88127e85a08ef744033a05fd67c7c..db24cd74c2739d556077452bb346f68c6e396d9e 100644
--- a/Source/Core/Windows/BitFlagsForm.cs
+++ b/Source/Core/Windows/BitFlagsForm.cs
@@ -30,6 +30,7 @@ namespace CodeImp.DoomBuilder.Windows
private bool setup;
private int value;
+ private int initialFlagsHeight; //mxd
#endregion
@@ -46,6 +47,9 @@ namespace CodeImp.DoomBuilder.Windows
{
// Initialize
InitializeComponent();
+
+ //mxd
+ initialFlagsHeight = options.Height;
}
#endregion
@@ -150,6 +154,9 @@ namespace CodeImp.DoomBuilder.Windows
}
}
+ //mxd
+ this.Height -= initialFlagsHeight - options.GetHeight();
+
setup = false;
}
diff --git a/Source/Core/Windows/BitFlagsForm.resx b/Source/Core/Windows/BitFlagsForm.resx
index 0520cc061e0922be8dcf5a6984d032b5d479c423..ff31a6db56e23b5a334f34387830ba5b4bd33eb8 100644
--- a/Source/Core/Windows/BitFlagsForm.resx
+++ b/Source/Core/Windows/BitFlagsForm.resx
@@ -117,16 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="options.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="apply.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
</root>
\ No newline at end of file