stjr
/
ZoneBuilder
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wow visual studio really sucks with tab/whitespace handling

This commit is contained in:
sphere 2021-03-21 16:09:33 +01:00
parent 88fbbaac2e
commit 2a258faa0b
4 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Controls/NumericTextbox.cs
View File

@ -36,7 +36,7 @@ namespace CodeImp.DoomBuilder.Controls
private bool allownegative; // Allow negative numbers private bool allownegative; // Allow negative numbers
private bool allowrelative; // Allow ++, --, * and / prefix for relative changes private bool allowrelative; // Allow ++, --, * and / prefix for relative changes
private bool allowdecimal; // Allow decimal (float) numbers private bool allowdecimal; // Allow decimal (float) numbers
private int maximumvalue = System.Int32.MaxValue; private int maximumvalue = System.Int32.MaxValue;
private bool controlpressed; private bool controlpressed;
private int incrementstep; //mxd. Step for +++ and --- prefixes private int incrementstep; //mxd. Step for +++ and --- prefixes

34
Source/Core/Controls/ThingBrowserControl.Designer.cs generated
View File

@ -367,27 +367,27 @@ namespace CodeImp.DoomBuilder.Controls
#endregion #endregion
private System.Windows.Forms.Label sizelabel; private System.Windows.Forms.Label sizelabel;
private System.Windows.Forms.Label blockinglabel; private System.Windows.Forms.Label blockinglabel;
private System.Windows.Forms.Label positionlabel; private System.Windows.Forms.Label positionlabel;
private NumericTextbox typeid; private NumericTextbox typeid;
private ButtonsNumericTextbox parameterid; private ButtonsNumericTextbox parameterid;
private System.Windows.Forms.ImageList thingimages; private System.Windows.Forms.ImageList thingimages;
private System.Windows.Forms.Panel infopanel; private System.Windows.Forms.Panel infopanel;
private System.Windows.Forms.Label sizecaption; private System.Windows.Forms.Label sizecaption;
private System.Windows.Forms.Label blockingcaption; private System.Windows.Forms.Label blockingcaption;
private System.Windows.Forms.Label positioncaption; private System.Windows.Forms.Label positioncaption;
private System.Windows.Forms.Label typecaption; private System.Windows.Forms.Label typecaption;
private System.Windows.Forms.Label parametercaption; private System.Windows.Forms.Label parametercaption;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox tbFilter; private System.Windows.Forms.TextBox tbFilter;
private System.Windows.Forms.Button bClear; private System.Windows.Forms.Button bClear;
private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview typelist; private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview typelist;
private System.Windows.Forms.Panel spritepanel; private System.Windows.Forms.Panel spritepanel;
private System.Windows.Forms.Timer updatetimer; private System.Windows.Forms.Timer updatetimer;
private ConfigurablePictureBox spritetex; private ConfigurablePictureBox spritetex;
private System.Windows.Forms.LinkLabel classname; private System.Windows.Forms.LinkLabel classname;
private System.Windows.Forms.Label labelclassname; private System.Windows.Forms.Label labelclassname;
private System.Windows.Forms.Label fulltypecaption; private System.Windows.Forms.Label fulltypecaption;
private System.Windows.Forms.Label fulltypelabel; private System.Windows.Forms.Label fulltypelabel;
} }

50
Source/Core/Controls/ThingInfoPanel.Designer.cs generated
View File

@ -477,38 +477,38 @@ namespace CodeImp.DoomBuilder.Controls
#endregion #endregion
private System.Windows.Forms.GroupBox spritepanel; private System.Windows.Forms.GroupBox spritepanel;
private System.Windows.Forms.Label spritename; private System.Windows.Forms.Label spritename;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label angle; private System.Windows.Forms.Label angle;
private System.Windows.Forms.Label tag; private System.Windows.Forms.Label tag;
private System.Windows.Forms.Label position; private System.Windows.Forms.Label position;
private System.Windows.Forms.Label action; private System.Windows.Forms.Label action;
private System.Windows.Forms.Label fulltype; private System.Windows.Forms.Label fulltype;
private System.Windows.Forms.Label type; private System.Windows.Forms.Label type;
private System.Windows.Forms.Label arg5; private System.Windows.Forms.Label arg5;
private System.Windows.Forms.Label arglbl5; private System.Windows.Forms.Label arglbl5;
private System.Windows.Forms.Label arglbl4; private System.Windows.Forms.Label arglbl4;
private System.Windows.Forms.Label arg4; private System.Windows.Forms.Label arg4;
private System.Windows.Forms.Label arglbl3; private System.Windows.Forms.Label arglbl3;
private System.Windows.Forms.Label arglbl2; private System.Windows.Forms.Label arglbl2;
private System.Windows.Forms.Label arg3; private System.Windows.Forms.Label arg3;
private System.Windows.Forms.Label arglbl1; private System.Windows.Forms.Label arglbl1;
private System.Windows.Forms.Label arg2; private System.Windows.Forms.Label arg2;
private System.Windows.Forms.Label arg1; private System.Windows.Forms.Label arg1;
private System.Windows.Forms.GroupBox infopanel; private System.Windows.Forms.GroupBox infopanel;
private System.Windows.Forms.GroupBox flagsPanel; private System.Windows.Forms.GroupBox flagsPanel;
private System.Windows.Forms.ListView flags; private System.Windows.Forms.ListView flags;
private System.Windows.Forms.Label flagsvalue; private System.Windows.Forms.Label flagsvalue;
private System.Windows.Forms.Label flagsvaluelabel; private System.Windows.Forms.Label flagsvaluelabel;
private System.Windows.Forms.Label labelangle; private System.Windows.Forms.Label labelangle;
private System.Windows.Forms.Label labeltag; private System.Windows.Forms.Label labeltag;
private System.Windows.Forms.Label labelaction; private System.Windows.Forms.Label labelaction;
private System.Windows.Forms.Label labelfulltype; private System.Windows.Forms.Label labelfulltype;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol; private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
private ConfigurablePictureBox spritetex; private ConfigurablePictureBox spritetex;
private System.Windows.Forms.Label classname; private System.Windows.Forms.Label classname;
private System.Windows.Forms.Label labelclass; private System.Windows.Forms.Label labelclass;
private System.Windows.Forms.Label parameter; private System.Windows.Forms.Label parameter;
private System.Windows.Forms.Label labelparameter; private System.Windows.Forms.Label labelparameter;

15
Source/Core/Controls/ThingInfoPanel.cs
View File

@ -67,11 +67,11 @@ namespace CodeImp.DoomBuilder.Controls
//mxd //mxd
action.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction; action.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction;
labelaction.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction; labelaction.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction;
fulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction; fulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction;
labelfulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction; labelfulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction;
// Move panel // Move panel
spritepanel.Left = infopanel.Left + infopanel.Width + infopanel.Margin.Right + spritepanel.Margin.Left; spritepanel.Left = infopanel.Left + infopanel.Width + infopanel.Margin.Right + spritepanel.Margin.Left;
flagsPanel.Left = spritepanel.Left + spritepanel.Width + spritepanel.Margin.Right + flagsPanel.Margin.Left; //mxd flagsPanel.Left = spritepanel.Left + spritepanel.Width + spritepanel.Margin.Right + flagsPanel.Margin.Left; //mxd
// Lookup thing info // Lookup thing info
@ -106,8 +106,8 @@ namespace CodeImp.DoomBuilder.Controls
if(ti.IsObsolete) type.Text += " - OBSOLETE"; //mxd if(ti.IsObsolete) type.Text += " - OBSOLETE"; //mxd
action.Text = actioninfo; action.Text = actioninfo;
classname.Visible = labelclass.Visible = !General.Map.SRB2; classname.Visible = labelclass.Visible = !General.Map.SRB2;
parameter.Enabled = labelparameter.Enabled = General.Map.SRB2; parameter.Enabled = labelparameter.Enabled = General.Map.SRB2;
parameter.Visible = labelparameter.Visible = General.Map.SRB2; parameter.Visible = labelparameter.Visible = General.Map.SRB2;
parameter.Text = t.Parameter.ToString(CultureInfo.InvariantCulture); parameter.Text = t.Parameter.ToString(CultureInfo.InvariantCulture);
@ -115,7 +115,7 @@ namespace CodeImp.DoomBuilder.Controls
labelclass.Enabled = classname.Enabled = displayclassname; //mxd labelclass.Enabled = classname.Enabled = displayclassname; //mxd
classname.Text = (displayclassname ? ti.ClassName : "--"); //mxd classname.Text = (displayclassname ? ti.ClassName : "--"); //mxd
fulltype.Text = t.FullType.ToString(CultureInfo.InvariantCulture); fulltype.Text = t.FullType.ToString(CultureInfo.InvariantCulture);
position.Text = t.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + t.Position.y.ToString(CultureInfo.InvariantCulture) + ", " + zinfo; position.Text = t.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + t.Position.y.ToString(CultureInfo.InvariantCulture) + ", " + zinfo;
tag.Text = t.Tag + (General.Map.Options.TagLabels.ContainsKey(t.Tag) ? " - " + General.Map.Options.TagLabels[t.Tag] : string.Empty); tag.Text = t.Tag + (General.Map.Options.TagLabels.ContainsKey(t.Tag) ? " - " + General.Map.Options.TagLabels[t.Tag] : string.Empty);
@ -243,7 +243,6 @@ namespace CodeImp.DoomBuilder.Controls
flagsPanel.Width = flags.Width + flags.Left * 2; flagsPanel.Width = flags.Width + flags.Left * 2;
} }
// Show the whole thing // Show the whole thing
this.Show(); this.Show();
this.Update(); this.Update();