From 559d5686423950f76db70903da11a20f69c3a5ec Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Mon, 15 Apr 2013 13:52:54 +0000
Subject: [PATCH] Some cosmetic changes in Hexen and ZDoom linedef
 configurations. Some cosmetic changes in Bit flags form.

---
 .../Includes/Hexen_linedefs.cfg               | 40 +++++++++----------
 .../Includes/ZDoom_linedefs.cfg               | 20 +++++-----
 Source/Core/Controls/CheckboxArrayControl.cs  |  8 ++++
 Source/Core/Windows/BitFlagsForm.Designer.cs  | 10 ++---
 Source/Core/Windows/BitFlagsForm.cs           |  7 ++++
 Source/Core/Windows/BitFlagsForm.resx         | 12 ------
 6 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/Build/Configurations/Includes/Hexen_linedefs.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg
index c850b4c7f..40293da57 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 ca8528190..93204b1f0 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 0077331db..ecf02d1a5 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 f4c4c0176..03837e425 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 db74461f4..db24cd74c 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 0520cc061..ff31a6db5 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
-- 
GitLab