stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-27 14:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Linedef Edit Form (Doom/Hexen map formats): fixed incorrect window size when using low display resolution (like 1024x768).

Browse source
This commit is contained in:
MaxED 2015-01-05 10:30:32 +00:00
parent 9c11d7e682
commit a91227e962
3 changed files with 49 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Source/Core/Windows/LinedefEditForm.Designer.cs generated
View file

@ -77,7 +77,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl(); this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl(); this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl(); this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
this.panel1 = new System.Windows.Forms.Panel(); this.panel = new System.Windows.Forms.Panel();
this.tooltip = new System.Windows.Forms.ToolTip(this.components); this.tooltip = new System.Windows.Forms.ToolTip(this.components);
label2 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label();
@ -96,7 +96,7 @@ namespace CodeImp.DoomBuilder.Windows
this.idgroup.SuspendLayout(); this.idgroup.SuspendLayout();
this.frontgroup.SuspendLayout(); this.frontgroup.SuspendLayout();
this.backgroup.SuspendLayout(); this.backgroup.SuspendLayout();
this.panel1.SuspendLayout(); this.panel.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// label2 // label2
@ -191,7 +191,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// cancel // cancel
// //
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancel.Location = new System.Drawing.Point(335, 764); this.cancel.Location = new System.Drawing.Point(335, 764);
this.cancel.Name = "cancel"; this.cancel.Name = "cancel";
@ -203,7 +203,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// apply // apply
// //
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(453, 764); this.apply.Location = new System.Drawing.Point(453, 764);
this.apply.Name = "apply"; this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(112, 25); this.apply.Size = new System.Drawing.Size(112, 25);
@ -372,7 +372,7 @@ namespace CodeImp.DoomBuilder.Windows
this.activation.FormattingEnabled = true; this.activation.FormattingEnabled = true;
this.activation.Location = new System.Drawing.Point(56, 13); this.activation.Location = new System.Drawing.Point(56, 13);
this.activation.Name = "activation"; this.activation.Name = "activation";
this.activation.Size = new System.Drawing.Size(428, 22); this.activation.Size = new System.Drawing.Size(463, 22);
this.activation.TabIndex = 0; this.activation.TabIndex = 0;
// //
// action // action
@ -433,7 +433,6 @@ namespace CodeImp.DoomBuilder.Windows
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.idgroup.Controls.Add(this.tagSelector); this.idgroup.Controls.Add(this.tagSelector);
this.idgroup.Location = new System.Drawing.Point(6, 658); this.idgroup.Location = new System.Drawing.Point(6, 658);
this.idgroup.Margin = new System.Windows.Forms.Padding(3, 3, 3, 6);
this.idgroup.Name = "idgroup"; this.idgroup.Name = "idgroup";
this.idgroup.Size = new System.Drawing.Size(541, 58); this.idgroup.Size = new System.Drawing.Size(541, 58);
this.idgroup.TabIndex = 2; this.idgroup.TabIndex = 2;
@ -444,7 +443,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
this.tagSelector.Location = new System.Drawing.Point(19, 19); this.tagSelector.Location = new System.Drawing.Point(19, 19);
this.tagSelector.Name = "tagSelector"; this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(444, 34); this.tagSelector.Size = new System.Drawing.Size(445, 34);
this.tagSelector.TabIndex = 0; this.tagSelector.TabIndex = 0;
// //
// frontside // frontside
@ -635,21 +634,20 @@ namespace CodeImp.DoomBuilder.Windows
this.backTextureOffset.TabIndex = 42; this.backTextureOffset.TabIndex = 42;
this.backTextureOffset.OnValuesChanged += new System.EventHandler(this.backTextureOffset_OnValuesChanged); this.backTextureOffset.OnValuesChanged += new System.EventHandler(this.backTextureOffset_OnValuesChanged);
// //
// panel1 // panel
// //
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.panel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panel1.BackColor = System.Drawing.SystemColors.Window; this.panel.BackColor = System.Drawing.SystemColors.Window;
this.panel1.Controls.Add(this.frontgroup); this.panel.Controls.Add(this.frontgroup);
this.panel1.Controls.Add(this.backgroup); this.panel.Controls.Add(this.backgroup);
this.panel1.Controls.Add(this.flagsgroup); this.panel.Controls.Add(this.flagsgroup);
this.panel1.Controls.Add(this.actiongroup); this.panel.Controls.Add(this.actiongroup);
this.panel1.Controls.Add(this.idgroup); this.panel.Controls.Add(this.idgroup);
this.panel1.Location = new System.Drawing.Point(12, 12); this.panel.Location = new System.Drawing.Point(12, 12);
this.panel1.Name = "panel1"; this.panel.Name = "panel";
this.panel1.Size = new System.Drawing.Size(553, 746); this.panel.Size = new System.Drawing.Size(553, 746);
this.panel1.TabIndex = 5; this.panel.TabIndex = 5;
// //
// LinedefEditForm // LinedefEditForm
// //
@ -660,7 +658,7 @@ namespace CodeImp.DoomBuilder.Windows
this.ClientSize = new System.Drawing.Size(577, 796); this.ClientSize = new System.Drawing.Size(577, 796);
this.Controls.Add(this.cancel); this.Controls.Add(this.cancel);
this.Controls.Add(this.apply); this.Controls.Add(this.apply);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel);
this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false; this.MaximizeBox = false;
@ -684,7 +682,7 @@ namespace CodeImp.DoomBuilder.Windows
this.frontgroup.PerformLayout(); this.frontgroup.PerformLayout();
this.backgroup.ResumeLayout(false); this.backgroup.ResumeLayout(false);
this.backgroup.PerformLayout(); this.backgroup.PerformLayout();
this.panel1.ResumeLayout(false); this.panel.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -728,7 +726,7 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset; private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset; private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset;
private System.Windows.Forms.ComboBox scriptNumbers; private System.Windows.Forms.ComboBox scriptNumbers;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel;
private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp; private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
private System.Windows.Forms.ToolTip tooltip; private System.Windows.Forms.ToolTip tooltip;
} }

14
Source/Core/Windows/LinedefEditForm.cs
View file

@ -147,19 +147,25 @@ namespace CodeImp.DoomBuilder.Windows
actiongroup.Height = argspanel.Top + argspanel.Margin.Top; //mxd actiongroup.Height = argspanel.Top + argspanel.Margin.Top; //mxd
} }
// Tag? // Arrange or hide Identification panel
int addedheight = this.ClientRectangle.Height - panel1.Height + panel1.Top + panel1.Margin.Top + panel1.Margin.Bottom;
if(General.Map.FormatInterface.HasLinedefTag) if(General.Map.FormatInterface.HasLinedefTag)
{ {
// Match position after the action group // Match position after the action group
idgroup.Top = actiongroup.Bottom + actiongroup.Margin.Bottom + idgroup.Margin.Top; idgroup.Top = actiongroup.Bottom + actiongroup.Margin.Bottom + idgroup.Margin.Top;
this.Height = idgroup.Bottom + idgroup.Margin.Bottom * 2 + addedheight; panel.Height = idgroup.Bottom + idgroup.Margin.Bottom * 2;
} }
else else
{ {
idgroup.Visible = false; idgroup.Visible = false;
this.Height = actiongroup.Bottom + actiongroup.Margin.Bottom * 3 + addedheight; panel.Height = actiongroup.Bottom + actiongroup.Margin.Bottom * 2;
} }
// Arrange Apply/Cancel buttons
apply.Top = panel.Bottom + panel.Margin.Bottom + apply.Margin.Top;
cancel.Top = apply.Top;
// Update window height
this.Height = apply.Bottom + apply.Margin.Bottom * 2 + (this.Height - this.ClientRectangle.Height) + 1;
} }
#endregion #endregion

54
Source/Core/Windows/LinedefEditForm.resx
View file

@ -174,43 +174,25 @@
<metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="frontlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="frontmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fronthigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="frontlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="frontmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fronthigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backhigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backhigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="frontlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="frontmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fronthigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backlow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backmid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="backhigh.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>