Changed, Linedef Edit form, non-UDMF: reduced window height (on Windows 7 it's 667 -> 639 pixels in Doom map format, 736 -> 698 pixels in Hexen map format).

Added inner highlight on mouse over to ImageSelectorControl.
This commit is contained in:
MaxED 2015-03-27 09:51:19 +00:00
parent 8af084187e
commit 487c0f8df7
4 changed files with 58 additions and 84 deletions

View file

@ -10,6 +10,12 @@ namespace CodeImp.DoomBuilder.Controls
{
public class ConfigurablePictureBox : PictureBox
{
#region ================== Constants
private const int BORDER_SIZE = 4;
#endregion
#region ================== Variables
private InterpolationMode interpolationmode = InterpolationMode.NearestNeighbor;
@ -17,6 +23,7 @@ namespace CodeImp.DoomBuilder.Controls
private CompositingQuality compositingquality = CompositingQuality.Default;
private PixelOffsetMode pixeloffsetmode = PixelOffsetMode.None;
private GraphicsUnit pageunit = GraphicsUnit.Pixel;
private readonly Color highlight = Color.FromArgb(196, SystemColors.Highlight);
#endregion
@ -27,6 +34,7 @@ namespace CodeImp.DoomBuilder.Controls
public CompositingQuality CompositingQuality { get { return compositingquality; } set { compositingquality = value; } }
public PixelOffsetMode PixelOffsetMode { get { return pixeloffsetmode; } set { pixeloffsetmode = value; } }
public GraphicsUnit PageUnit { get { return pageunit; } set { pageunit = value; } }
public bool Highlighted { get; set; }
#endregion
@ -40,6 +48,15 @@ namespace CodeImp.DoomBuilder.Controls
pe.Graphics.PageUnit = PageUnit;
pe.Graphics.PixelOffsetMode = PixelOffsetMode;
base.OnPaint(pe);
if(Highlighted)
{
ControlPaint.DrawBorder(pe.Graphics, DisplayRectangle,
highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
highlight, BORDER_SIZE, ButtonBorderStyle.Solid);
}
}
#endregion

View file

@ -132,12 +132,14 @@ namespace CodeImp.DoomBuilder.Controls
private void preview_MouseLeave(object sender, EventArgs e)
{
imagebox.BackColor = SystemColors.AppWorkspace;
imagebox.Highlighted = false;
}
// Mouse enters
private void preview_MouseEnter(object sender, EventArgs e)
{
imagebox.BackColor = SystemColors.Highlight;
imagebox.Highlighted = true;
}
//mxd

View file

@ -104,7 +104,7 @@ namespace CodeImp.DoomBuilder.Windows
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(15, 30);
label2.Location = new System.Drawing.Point(15, 26);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(40, 13);
label2.TabIndex = 9;
@ -112,7 +112,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label3
//
label3.Location = new System.Drawing.Point(255, 18);
label3.Location = new System.Drawing.Point(255, 13);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(83, 16);
label3.TabIndex = 3;
@ -121,7 +121,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label4
//
label4.Location = new System.Drawing.Point(346, 18);
label4.Location = new System.Drawing.Point(346, 13);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(83, 16);
label4.TabIndex = 4;
@ -130,7 +130,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label5
//
label5.Location = new System.Drawing.Point(437, 18);
label5.Location = new System.Drawing.Point(437, 13);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(83, 16);
label5.TabIndex = 5;
@ -139,7 +139,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label8
//
label8.Location = new System.Drawing.Point(437, 18);
label8.Location = new System.Drawing.Point(437, 13);
label8.Name = "label8";
label8.Size = new System.Drawing.Size(83, 16);
label8.TabIndex = 5;
@ -148,7 +148,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label9
//
label9.Location = new System.Drawing.Point(346, 18);
label9.Location = new System.Drawing.Point(346, 13);
label9.Name = "label9";
label9.Size = new System.Drawing.Size(83, 16);
label9.TabIndex = 4;
@ -157,7 +157,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// label10
//
label10.Location = new System.Drawing.Point(255, 18);
label10.Location = new System.Drawing.Point(255, 13);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(83, 16);
label10.TabIndex = 3;
@ -185,7 +185,7 @@ namespace CodeImp.DoomBuilder.Windows
// activationlabel
//
activationlabel.AutoSize = true;
activationlabel.Location = new System.Drawing.Point(6, 17);
activationlabel.Location = new System.Drawing.Point(6, 11);
activationlabel.Name = "activationlabel";
activationlabel.Size = new System.Drawing.Size(43, 13);
activationlabel.TabIndex = 10;
@ -213,7 +213,7 @@ namespace CodeImp.DoomBuilder.Windows
//
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.Location = new System.Drawing.Point(453, 764);
this.cancel.Location = new System.Drawing.Point(453, 708);
this.cancel.Name = "cancel";
this.cancel.Size = new System.Drawing.Size(112, 25);
this.cancel.TabIndex = 2;
@ -224,7 +224,7 @@ namespace CodeImp.DoomBuilder.Windows
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(335, 764);
this.apply.Location = new System.Drawing.Point(335, 708);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(112, 25);
this.apply.TabIndex = 1;
@ -242,16 +242,16 @@ namespace CodeImp.DoomBuilder.Windows
this.actiongroup.Controls.Add(label2);
this.actiongroup.Controls.Add(this.action);
this.actiongroup.Controls.Add(this.browseaction);
this.actiongroup.Location = new System.Drawing.Point(6, 462);
this.actiongroup.Location = new System.Drawing.Point(6, 438);
this.actiongroup.Name = "actiongroup";
this.actiongroup.Size = new System.Drawing.Size(541, 190);
this.actiongroup.Size = new System.Drawing.Size(541, 176);
this.actiongroup.TabIndex = 1;
this.actiongroup.TabStop = false;
this.actiongroup.Text = " Action ";
//
// actionhelp
//
this.actionhelp.Location = new System.Drawing.Point(497, 25);
this.actionhelp.Location = new System.Drawing.Point(497, 21);
this.actionhelp.Name = "actionhelp";
this.actionhelp.Size = new System.Drawing.Size(28, 25);
this.actionhelp.TabIndex = 11;
@ -269,7 +269,7 @@ namespace CodeImp.DoomBuilder.Windows
this.argspanel.Controls.Add(this.arg2label);
this.argspanel.Controls.Add(this.arg4label);
this.argspanel.Controls.Add(this.arg0label);
this.argspanel.Location = new System.Drawing.Point(6, 54);
this.argspanel.Location = new System.Drawing.Point(6, 50);
this.argspanel.Name = "argspanel";
this.argspanel.Size = new System.Drawing.Size(521, 83);
this.argspanel.TabIndex = 2;
@ -376,9 +376,9 @@ namespace CodeImp.DoomBuilder.Windows
//
this.hexenpanel.Controls.Add(this.activation);
this.hexenpanel.Controls.Add(activationlabel);
this.hexenpanel.Location = new System.Drawing.Point(6, 139);
this.hexenpanel.Location = new System.Drawing.Point(6, 134);
this.hexenpanel.Name = "hexenpanel";
this.hexenpanel.Size = new System.Drawing.Size(521, 44);
this.hexenpanel.Size = new System.Drawing.Size(521, 36);
this.hexenpanel.TabIndex = 3;
this.hexenpanel.Visible = false;
//
@ -386,7 +386,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.activation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.activation.FormattingEnabled = true;
this.activation.Location = new System.Drawing.Point(56, 13);
this.activation.Location = new System.Drawing.Point(56, 7);
this.activation.Name = "activation";
this.activation.Size = new System.Drawing.Size(463, 21);
this.activation.TabIndex = 0;
@ -398,7 +398,7 @@ namespace CodeImp.DoomBuilder.Windows
this.action.Empty = false;
this.action.GeneralizedCategories = null;
this.action.GeneralizedOptions = null;
this.action.Location = new System.Drawing.Point(62, 27);
this.action.Location = new System.Drawing.Point(62, 23);
this.action.Name = "action";
this.action.Size = new System.Drawing.Size(402, 21);
this.action.TabIndex = 0;
@ -408,7 +408,7 @@ namespace CodeImp.DoomBuilder.Windows
// browseaction
//
this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
this.browseaction.Location = new System.Drawing.Point(467, 25);
this.browseaction.Location = new System.Drawing.Point(467, 21);
this.browseaction.Name = "browseaction";
this.browseaction.Size = new System.Drawing.Size(28, 25);
this.browseaction.TabIndex = 1;
@ -422,7 +422,7 @@ namespace CodeImp.DoomBuilder.Windows
this.flagsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.flagsgroup.Controls.Add(this.flags);
this.flagsgroup.Location = new System.Drawing.Point(6, 338);
this.flagsgroup.Location = new System.Drawing.Point(6, 314);
this.flagsgroup.Name = "flagsgroup";
this.flagsgroup.Size = new System.Drawing.Size(541, 118);
this.flagsgroup.TabIndex = 0;
@ -448,7 +448,7 @@ namespace CodeImp.DoomBuilder.Windows
this.idgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.idgroup.Controls.Add(this.tagSelector);
this.idgroup.Location = new System.Drawing.Point(6, 658);
this.idgroup.Location = new System.Drawing.Point(6, 620);
this.idgroup.Name = "idgroup";
this.idgroup.Size = new System.Drawing.Size(541, 58);
this.idgroup.TabIndex = 2;
@ -490,7 +490,7 @@ namespace CodeImp.DoomBuilder.Windows
this.frontgroup.Enabled = false;
this.frontgroup.Location = new System.Drawing.Point(6, 6);
this.frontgroup.Name = "frontgroup";
this.frontgroup.Size = new System.Drawing.Size(541, 160);
this.frontgroup.Size = new System.Drawing.Size(541, 148);
this.frontgroup.TabIndex = 1;
this.frontgroup.TabStop = false;
this.frontgroup.Text = " ";
@ -514,11 +514,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// frontlow
//
this.frontlow.Location = new System.Drawing.Point(437, 37);
this.frontlow.Location = new System.Drawing.Point(437, 32);
this.frontlow.MultipleTextures = false;
this.frontlow.Name = "frontlow";
this.frontlow.Required = false;
this.frontlow.Size = new System.Drawing.Size(83, 112);
this.frontlow.Size = new System.Drawing.Size(83, 107);
this.frontlow.TabIndex = 6;
this.frontlow.TextureName = "";
this.frontlow.UsePreviews = true;
@ -526,11 +526,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// frontmid
//
this.frontmid.Location = new System.Drawing.Point(346, 37);
this.frontmid.Location = new System.Drawing.Point(346, 32);
this.frontmid.MultipleTextures = false;
this.frontmid.Name = "frontmid";
this.frontmid.Required = false;
this.frontmid.Size = new System.Drawing.Size(83, 112);
this.frontmid.Size = new System.Drawing.Size(83, 107);
this.frontmid.TabIndex = 5;
this.frontmid.TextureName = "";
this.frontmid.UsePreviews = true;
@ -538,11 +538,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// fronthigh
//
this.fronthigh.Location = new System.Drawing.Point(255, 37);
this.fronthigh.Location = new System.Drawing.Point(255, 32);
this.fronthigh.MultipleTextures = false;
this.fronthigh.Name = "fronthigh";
this.fronthigh.Required = false;
this.fronthigh.Size = new System.Drawing.Size(83, 112);
this.fronthigh.Size = new System.Drawing.Size(83, 107);
this.fronthigh.TabIndex = 4;
this.fronthigh.TextureName = "";
this.fronthigh.UsePreviews = true;
@ -564,7 +564,7 @@ namespace CodeImp.DoomBuilder.Windows
// backside
//
this.backside.AutoSize = true;
this.backside.Location = new System.Drawing.Point(17, 170);
this.backside.Location = new System.Drawing.Point(17, 158);
this.backside.Name = "backside";
this.backside.Size = new System.Drawing.Size(75, 17);
this.backside.TabIndex = 0;
@ -587,9 +587,9 @@ namespace CodeImp.DoomBuilder.Windows
this.backgroup.Controls.Add(label9);
this.backgroup.Controls.Add(label10);
this.backgroup.Enabled = false;
this.backgroup.Location = new System.Drawing.Point(6, 172);
this.backgroup.Location = new System.Drawing.Point(6, 160);
this.backgroup.Name = "backgroup";
this.backgroup.Size = new System.Drawing.Size(541, 160);
this.backgroup.Size = new System.Drawing.Size(541, 148);
this.backgroup.TabIndex = 1;
this.backgroup.TabStop = false;
this.backgroup.Text = " ";
@ -613,11 +613,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// backlow
//
this.backlow.Location = new System.Drawing.Point(437, 37);
this.backlow.Location = new System.Drawing.Point(437, 32);
this.backlow.MultipleTextures = false;
this.backlow.Name = "backlow";
this.backlow.Required = false;
this.backlow.Size = new System.Drawing.Size(83, 112);
this.backlow.Size = new System.Drawing.Size(83, 107);
this.backlow.TabIndex = 6;
this.backlow.TextureName = "";
this.backlow.UsePreviews = true;
@ -625,11 +625,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// backmid
//
this.backmid.Location = new System.Drawing.Point(346, 37);
this.backmid.Location = new System.Drawing.Point(346, 32);
this.backmid.MultipleTextures = false;
this.backmid.Name = "backmid";
this.backmid.Required = false;
this.backmid.Size = new System.Drawing.Size(83, 112);
this.backmid.Size = new System.Drawing.Size(83, 107);
this.backmid.TabIndex = 5;
this.backmid.TextureName = "";
this.backmid.UsePreviews = true;
@ -637,11 +637,11 @@ namespace CodeImp.DoomBuilder.Windows
//
// backhigh
//
this.backhigh.Location = new System.Drawing.Point(255, 37);
this.backhigh.Location = new System.Drawing.Point(255, 32);
this.backhigh.MultipleTextures = false;
this.backhigh.Name = "backhigh";
this.backhigh.Required = false;
this.backhigh.Size = new System.Drawing.Size(83, 112);
this.backhigh.Size = new System.Drawing.Size(83, 107);
this.backhigh.TabIndex = 4;
this.backhigh.TextureName = "";
this.backhigh.UsePreviews = true;
@ -674,7 +674,7 @@ namespace CodeImp.DoomBuilder.Windows
this.panel.Controls.Add(this.idgroup);
this.panel.Location = new System.Drawing.Point(12, 12);
this.panel.Name = "panel";
this.panel.Size = new System.Drawing.Size(553, 746);
this.panel.Size = new System.Drawing.Size(553, 686);
this.panel.TabIndex = 5;
//
// LinedefEditForm
@ -683,7 +683,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(577, 796);
this.ClientSize = new System.Drawing.Size(577, 740);
this.Controls.Add(this.cancel);
this.Controls.Add(this.apply);
this.Controls.Add(this.panel);

View file

@ -117,45 +117,24 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label9.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label10.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@ -165,34 +144,10 @@
<metadata name="label12.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="activationlabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="activationlabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="hexenpanel.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">
<value>17, 17</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>
</root>