mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-23 12:22:35 +00:00
High-Dpi: redesigned Docker control's Pin button. Now it is rendered properly when using high-dpi display settings.
This commit is contained in:
MaxED
parent
c34d07c506
commit
a531e41a50
12 changed files with 111 additions and 72 deletions
|
|
@ -1033,6 +1033,10 @@
|
|||
<None Include="Resources\ImageStack.png" />
|
||||
<None Include="Resources\FolderExplore.png" />
|
||||
<None Include="Resources\Expand.png" />
|
||||
<None Include="Resources\DockerCollapse.png" />
|
||||
<None Include="Resources\DockerExpand.png" />
|
||||
<None Include="Resources\InfoPanelCollapse.png" />
|
||||
<None Include="Resources\InfoPanelExpand.png" />
|
||||
<Content Include="Resources\Light.png" />
|
||||
<None Include="Resources\Lightbulb.png" />
|
||||
<None Include="Resources\LightDisabled.png" />
|
||||
|
|
@ -1052,7 +1056,6 @@
|
|||
<None Include="Resources\SearchMatchCase.png" />
|
||||
<None Include="Resources\SearchMatch.png" />
|
||||
<None Include="Resources\WordWrap.png" />
|
||||
<None Include="Resources\ThingCategory.png" />
|
||||
<None Include="Resources\ScreenshotActiveWindow.png" />
|
||||
<None Include="Resources\Screenshot.png" />
|
||||
<None Include="Resources\PuzzlePiece.png" />
|
||||
|
|
|
|||
33
Source/Core/Controls/DockersControl.Designer.cs
generated
33
Source/Core/Controls/DockersControl.Designer.cs
generated
|
|
@ -28,21 +28,11 @@
|
|||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.buttonTogglePinning = new System.Windows.Forms.Button();
|
||||
this.splitter = new CodeImp.DoomBuilder.Controls.TransparentPanel();
|
||||
this.tabs = new CodeImp.DoomBuilder.Controls.DockersTabsControl();
|
||||
this.pinbutton = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// buttonTogglePinning
|
||||
//
|
||||
this.buttonTogglePinning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonTogglePinning.Location = new System.Drawing.Point(282, 4);
|
||||
this.buttonTogglePinning.Name = "buttonTogglePinning";
|
||||
this.buttonTogglePinning.Size = new System.Drawing.Size(24, 24);
|
||||
this.buttonTogglePinning.TabIndex = 0;
|
||||
this.buttonTogglePinning.UseVisualStyleBackColor = true;
|
||||
this.buttonTogglePinning.Click += new System.EventHandler(this.buttonTogglePinning_Click);
|
||||
//
|
||||
// splitter
|
||||
//
|
||||
this.splitter.BackColor = System.Drawing.SystemColors.Control;
|
||||
|
|
@ -66,13 +56,13 @@
|
|||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.tabs.ItemSize = new System.Drawing.Size(100, 26);
|
||||
this.tabs.Location = new System.Drawing.Point(0, 0);
|
||||
this.tabs.Location = new System.Drawing.Point(0, 18);
|
||||
this.tabs.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.tabs.Multiline = true;
|
||||
this.tabs.Name = "tabs";
|
||||
this.tabs.Padding = new System.Drawing.Point(10, 5);
|
||||
this.tabs.SelectedIndex = 0;
|
||||
this.tabs.Size = new System.Drawing.Size(308, 541);
|
||||
this.tabs.Size = new System.Drawing.Size(308, 523);
|
||||
this.tabs.TabIndex = 0;
|
||||
this.tabs.TabStop = false;
|
||||
this.tabs.MouseLeave += new System.EventHandler(this.RaiseMouseContainerLeave);
|
||||
|
|
@ -82,16 +72,29 @@
|
|||
this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
|
||||
this.tabs.MouseEnter += new System.EventHandler(this.RaiseMouseContainerEnter);
|
||||
//
|
||||
// pinbutton
|
||||
//
|
||||
this.pinbutton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.pinbutton.Image = global::CodeImp.DoomBuilder.Properties.Resources.DockerCollapse;
|
||||
this.pinbutton.Location = new System.Drawing.Point(3, 1);
|
||||
this.pinbutton.Name = "pinbutton";
|
||||
this.pinbutton.Size = new System.Drawing.Size(305, 14);
|
||||
this.pinbutton.TabIndex = 0;
|
||||
this.pinbutton.TabStop = false;
|
||||
this.pinbutton.UseVisualStyleBackColor = true;
|
||||
this.pinbutton.Click += new System.EventHandler(this.pinbutton_Click);
|
||||
//
|
||||
// DockersControl
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.Controls.Add(this.buttonTogglePinning);
|
||||
this.Controls.Add(this.pinbutton);
|
||||
this.Controls.Add(this.splitter);
|
||||
this.Controls.Add(this.tabs);
|
||||
this.Name = "DockersControl";
|
||||
this.Size = new System.Drawing.Size(308, 541);
|
||||
this.MouseLeave += new System.EventHandler(this.RaiseMouseContainerLeave);
|
||||
this.Resize += new System.EventHandler(this.DockersControl_Resize);
|
||||
this.MouseEnter += new System.EventHandler(this.RaiseMouseContainerEnter);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
|
|
@ -101,6 +104,6 @@
|
|||
|
||||
private DockersTabsControl tabs;
|
||||
private TransparentPanel splitter;
|
||||
private System.Windows.Forms.Button buttonTogglePinning;
|
||||
private System.Windows.Forms.Button pinbutton;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,10 +88,6 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
{
|
||||
InitializeComponent();
|
||||
expandedwidth = (int)(this.Width * (this.CurrentAutoScaleDimensions.Width / this.AutoScaleDimensions.Width));
|
||||
tabs.TabsOffsetTop = buttonTogglePinning.Bottom + 2; //mxd
|
||||
|
||||
if(General.Settings != null)
|
||||
buttonTogglePinning.Image = General.Settings.CollapseDockers ? Properties.Resources.Unpin : Properties.Resources.Pin; //mxd
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
@ -106,10 +102,8 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
while(c is IContainerControl)
|
||||
{
|
||||
IContainerControl cc = (c as IContainerControl);
|
||||
if(cc.ActiveControl != null)
|
||||
c = cc.ActiveControl;
|
||||
else
|
||||
break;
|
||||
if(cc.ActiveControl != null) c = cc.ActiveControl;
|
||||
else break;
|
||||
}
|
||||
|
||||
return c;
|
||||
|
|
@ -118,27 +112,25 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
// This sets up the controls for left or right alignment
|
||||
public void Setup(bool right)
|
||||
{
|
||||
int voffset = pinbutton.Bottom + pinbutton.Margin.Bottom; //mxd
|
||||
rightalign = right;
|
||||
if(rightalign)
|
||||
{
|
||||
splitter.Dock = DockStyle.Left;
|
||||
tabs.Alignment = TabAlignment.Right;
|
||||
tabs.Location = new Point(0, 0);
|
||||
buttonTogglePinning.Location = new Point(this.ClientRectangle.Width - buttonTogglePinning.Width - 2, buttonTogglePinning.Top); //mxd
|
||||
buttonTogglePinning.Anchor = AnchorStyles.Right | AnchorStyles.Top; //mxd
|
||||
tabs.Size = new Size(this.ClientRectangle.Width + 2, this.ClientRectangle.Height);
|
||||
tabs.Location = new Point(0, voffset);
|
||||
tabs.Size = new Size(this.ClientRectangle.Width + 2, this.ClientRectangle.Height - voffset);
|
||||
}
|
||||
else
|
||||
{
|
||||
splitter.Dock = DockStyle.Right;
|
||||
tabs.Alignment = TabAlignment.Left;
|
||||
tabs.Location = new Point(-2, 0);
|
||||
buttonTogglePinning.Location = new Point(2, buttonTogglePinning.Top); //mxd
|
||||
buttonTogglePinning.Anchor = AnchorStyles.Left | AnchorStyles.Top; //mxd
|
||||
tabs.Size = new Size(this.ClientRectangle.Width + 2, this.ClientRectangle.Height);
|
||||
tabs.Location = new Point(-2, voffset);
|
||||
tabs.Size = new Size(this.ClientRectangle.Width + 2, this.ClientRectangle.Height - voffset);
|
||||
}
|
||||
|
||||
tabs.SendToBack();
|
||||
UpdatePinIcon(); //mxd
|
||||
}
|
||||
|
||||
// This collapses the docker
|
||||
|
|
@ -337,6 +329,15 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
tabs.TabPages.Add(p.Value);
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void UpdatePinIcon()
|
||||
{
|
||||
if(tabs.Alignment == TabAlignment.Left)
|
||||
pinbutton.Image = (General.Settings.CollapseDockers ? Properties.Resources.DockerCollapse : Properties.Resources.DockerExpand);
|
||||
else
|
||||
pinbutton.Image = (General.Settings.CollapseDockers ? Properties.Resources.DockerExpand : Properties.Resources.DockerCollapse);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region ================== Events
|
||||
|
|
@ -445,11 +446,17 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
}
|
||||
|
||||
//mxd
|
||||
private void buttonTogglePinning_Click(object sender, EventArgs e)
|
||||
private void pinbutton_Click(object sender, EventArgs e)
|
||||
{
|
||||
General.Settings.CollapseDockers = !General.Settings.CollapseDockers;
|
||||
General.MainWindow.SetupInterface();
|
||||
buttonTogglePinning.Image = General.Settings.CollapseDockers ? Properties.Resources.Unpin : Properties.Resources.Pin;
|
||||
UpdatePinIcon();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void DockersControl_Resize(object sender, EventArgs e)
|
||||
{
|
||||
pinbutton.Width = this.Width - pinbutton.Margin.Left - pinbutton.Margin.Right;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -37,13 +37,6 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
|
||||
private Bitmap tabsimage;
|
||||
private int highlighttab;
|
||||
private int tabsOffsetTop; //mxd
|
||||
|
||||
#endregion
|
||||
|
||||
#region ================== Properties
|
||||
|
||||
public int TabsOffsetTop { get { return tabsOffsetTop; } internal set { tabsOffsetTop = value; } } //mxd
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -125,9 +118,6 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
VisualStyleRenderer renderer;
|
||||
Rectangle tr = this.GetTabRect(i);
|
||||
|
||||
//mxd. A cheap way to display pin button without rewriting this sodding control from scratch...
|
||||
if(i == 0) tr.Height -= tabsOffsetTop;
|
||||
|
||||
// Tab selected?
|
||||
if(i == this.SelectedIndex)
|
||||
{
|
||||
|
|
@ -142,8 +132,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
renderer = new VisualStyleRenderer(VisualStyleElement.Tab.TabItem.Normal);
|
||||
|
||||
// Draw tab
|
||||
int ox = (this.Alignment == TabAlignment.Left ? tabsOffsetTop : 0); //mxd
|
||||
Rectangle r = new Rectangle(posoffset + ox + 2, 2, tr.Height, tr.Width - 2);
|
||||
Rectangle r = new Rectangle(posoffset + 2, 2, tr.Height, tr.Width - 2);
|
||||
renderer.DrawBackground(g, r);
|
||||
g.DrawString(this.TabPages[i].Text, this.Font, SystemBrushes.ControlText, new RectangleF(r.Location, r.Size), drawformat);
|
||||
}
|
||||
|
|
@ -156,8 +145,6 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
{
|
||||
VisualStyleRenderer renderer = new VisualStyleRenderer(VisualStyleElement.Tab.TabItem.Pressed);
|
||||
Rectangle tr = this.GetTabRect(this.SelectedIndex);
|
||||
if(this.SelectedIndex == 0) tr.Height -= tabsOffsetTop; //mxd
|
||||
if(this.Alignment == TabAlignment.Left) selectedposoffset += tabsOffsetTop; //mxd
|
||||
Rectangle r = new Rectangle(selectedposoffset, 0, tr.Height + 4, tr.Width);
|
||||
renderer.DrawBackground(g, r);
|
||||
g.DrawString(this.TabPages[this.SelectedIndex].Text, this.Font, SystemBrushes.ControlText, new RectangleF(r.X, r.Y, r.Width, r.Height - 2), drawformat);
|
||||
|
|
|
|||
30
Source/Core/Properties/Resources.Designer.cs
generated
30
Source/Core/Properties/Resources.Designer.cs
generated
|
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.5420
|
||||
// Runtime Version:2.0.50727.5466
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
@ -165,6 +165,20 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap DockerCollapse {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("DockerCollapse", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap DockerExpand {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("DockerExpand", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap ErrorLarge {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("ErrorLarge", resourceCulture);
|
||||
|
|
@ -291,6 +305,20 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap InfoPanelCollapse {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("InfoPanelCollapse", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap InfoPanelExpand {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("InfoPanelExpand", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Keyboard {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Keyboard", resourceCulture);
|
||||
|
|
|
|||
|
|
@ -166,8 +166,8 @@
|
|||
<data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Replace" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -196,8 +196,8 @@
|
|||
<data name="ScriptHelp" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptHelp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -214,6 +214,12 @@
|
|||
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -316,6 +322,9 @@
|
|||
<data name="MCrash" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="DockerExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\DockerExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ModelDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ModelDisabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -349,8 +358,8 @@
|
|||
<data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScreenshotActiveWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScreenshotActiveWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -388,9 +397,6 @@
|
|||
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -400,8 +406,8 @@
|
|||
<data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -421,8 +427,8 @@
|
|||
<data name="ViewTextureFloor" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Pin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Pin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -436,6 +442,9 @@
|
|||
<data name="Monster3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="DockerCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\DockerCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -463,8 +472,8 @@
|
|||
<data name="WarningLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -472,7 +481,10 @@
|
|||
<data name="Check" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Replace" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="InfoPanelCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\InfoPanelCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="InfoPanelExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\InfoPanelExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
Source/Core/Resources/DockerCollapse.png
Normal file
BIN
Source/Core/Resources/DockerCollapse.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
Source/Core/Resources/DockerExpand.png
Normal file
BIN
Source/Core/Resources/DockerExpand.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
Source/Core/Resources/InfoPanelCollapse.png
Normal file
BIN
Source/Core/Resources/InfoPanelCollapse.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
Source/Core/Resources/InfoPanelExpand.png
Normal file
BIN
Source/Core/Resources/InfoPanelExpand.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
7
Source/Core/Windows/MainForm.Designer.cs
generated
7
Source/Core/Windows/MainForm.Designer.cs
generated
|
|
@ -2044,7 +2044,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// labelcollapsedinfo
|
||||
//
|
||||
this.labelcollapsedinfo.AutoSize = true;
|
||||
this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.labelcollapsedinfo.Location = new System.Drawing.Point(2, 2);
|
||||
this.labelcollapsedinfo.Name = "labelcollapsedinfo";
|
||||
this.labelcollapsedinfo.Size = new System.Drawing.Size(137, 13);
|
||||
|
|
@ -2061,7 +2061,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.modename.Name = "modename";
|
||||
this.modename.Size = new System.Drawing.Size(244, 59);
|
||||
this.modename.TabIndex = 8;
|
||||
this.modename.Text = "Vertices";
|
||||
this.modename.Text = "Hi. I missed you.";
|
||||
this.modename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.modename.UseMnemonic = false;
|
||||
this.modename.Visible = false;
|
||||
|
|
@ -2070,14 +2070,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
this.buttontoggleinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttontoggleinfo.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.buttontoggleinfo.Font = new System.Drawing.Font("Marlett", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.buttontoggleinfo.Image = global::CodeImp.DoomBuilder.Properties.Resources.InfoPanelCollapse;
|
||||
this.buttontoggleinfo.Location = new System.Drawing.Point(988, 1);
|
||||
this.buttontoggleinfo.Name = "buttontoggleinfo";
|
||||
this.buttontoggleinfo.Size = new System.Drawing.Size(22, 19);
|
||||
this.buttontoggleinfo.TabIndex = 5;
|
||||
this.buttontoggleinfo.TabStop = false;
|
||||
this.buttontoggleinfo.Tag = "builder_toggleinfopanel";
|
||||
this.buttontoggleinfo.Text = "6";
|
||||
this.buttontoggleinfo.UseVisualStyleBackColor = true;
|
||||
this.buttontoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
this.buttontoggleinfo.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttontoggleinfo_MouseUp);
|
||||
|
|
|
|||
|
|
@ -3156,7 +3156,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(IsInfoPanelExpanded)
|
||||
{
|
||||
panelinfo.Height = buttontoggleinfo.Height + buttontoggleinfo.Top;
|
||||
buttontoggleinfo.Text = "5"; // Arrow up
|
||||
buttontoggleinfo.Image = Resources.InfoPanelExpand; //mxd
|
||||
if(linedefinfo.Visible) linedefinfo.Hide();
|
||||
if(vertexinfo.Visible) vertexinfo.Hide();
|
||||
if(sectorinfo.Visible) sectorinfo.Hide();
|
||||
|
|
@ -3172,7 +3172,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
else
|
||||
{
|
||||
panelinfo.Height = heightpanel1.Height;
|
||||
buttontoggleinfo.Text = "6"; // Arrow down
|
||||
buttontoggleinfo.Image = Resources.InfoPanelCollapse; //mxd
|
||||
labelcollapsedinfo.Visible = false;
|
||||
itemtoggleinfo.Checked = true;
|
||||
if(lastinfoobject is Vertex) ShowVertexInfo(lastinfoobject as Vertex);
|
||||
|
|
|
|||
Loading…
Reference in a new issue