From 8b161a78a6dec55482b657d0bddc3ac70e20c5e6 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Mon, 11 Sep 2023 02:05:46 +0200
Subject: [PATCH] Draw Modes: Don't draw preview lines when "Place things" is
enabled
---
.../ClassicModes/DrawCurveMode.cs | 21 ++++++++++--------
.../ClassicModes/DrawEllipseMode.cs | 6 ++---
.../ClassicModes/DrawGeometryMode.cs | 6 ++---
.../ClassicModes/DrawRectangleMode.cs | 15 ++++++++-----
.../DrawCurveOptionsPanel.Designer.cs | 22 +++++++++----------
.../Interface/DrawCurveOptionsPanel.cs | 12 +++++-----
.../DrawEllipseOptionsPanel.Designer.cs | 22 +++++++++----------
.../Interface/DrawEllipseOptionsPanel.cs | 12 +++++-----
.../DrawRectangleOptionsPanel.Designer.cs | 22 +++++++++----------
.../Interface/DrawRectangleOptionsPanel.cs | 12 +++++-----
10 files changed, 78 insertions(+), 72 deletions(-)
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs
index 7b423722e..8044fa808 100755
--- a/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs
@@ -101,13 +101,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
curve = CurveTools.CurveThroughPoints(verts, 0.5f, 0.75f, segmentlength);
// Render lines
- for(int i = 1; i < curve.Shape.Count; i++)
+ if (!placethingsatvertices)
{
- // Determine line color
- PixelColor c = snaptonearest ? stitchcolor : losecolor;
+ for (int i = 1; i < curve.Shape.Count; i++)
+ {
+ // Determine line color
+ PixelColor c = snaptonearest ? stitchcolor : losecolor;
- // Render line
- renderer.RenderLine(curve.Shape[i - 1], curve.Shape[i], LINE_THICKNESS, c, true);
+ // Render line
+ renderer.RenderLine(curve.Shape[i - 1], curve.Shape[i], LINE_THICKNESS, c, true);
+ }
}
//render "inactive" vertices
@@ -237,7 +240,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
// Make the drawing
- if (drawthingsatvertices)
+ if (placethingsatvertices)
{
List<Vector2D> points = new List<Vector2D>();
for (int i = 0; i < verts.Count; i++)
@@ -340,12 +343,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
panel.OnValueChanged += OptionsPanelOnValueChanged;
panel.OnContinuousDrawingChanged += OnContinuousDrawingChanged;
panel.OnAutoCloseDrawingChanged += OnAutoCloseDrawingChanged;
- panel.OnDrawThingsAtVerticesChanged += OnDrawThingsAtVerticesChanged;
+ panel.OnPlaceThingsAtVerticesChanged += OnPlaceThingsAtVerticesChanged;
// Needs to be set after adding the events...
panel.ContinuousDrawing = General.Settings.ReadPluginSetting("drawcurvemode.continuousdrawing", false);
panel.AutoCloseDrawing = General.Settings.ReadPluginSetting("drawcurvemode.autoclosedrawing", false);
- panel.DrawThingsAtVertices = General.Settings.ReadPluginSetting("drawcurvemode.drawthingsatvertices", false);
+ panel.PlaceThingsAtVertices = General.Settings.ReadPluginSetting("drawcurvemode.placethingsatvertices", false);
}
protected override void AddInterface()
@@ -359,7 +362,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Settings.WritePluginSetting("drawcurvemode.segmentlength", segmentlength);
General.Settings.WritePluginSetting("drawcurvemode.continuousdrawing", panel.ContinuousDrawing);
General.Settings.WritePluginSetting("drawcurvemode.autoclosedrawing", panel.AutoCloseDrawing);
- General.Settings.WritePluginSetting("drawcurvemode.drawthingsatvertices", panel.DrawThingsAtVertices);
+ General.Settings.WritePluginSetting("drawcurvemode.placethingsatvertices", panel.PlaceThingsAtVertices);
// Remove the buttons
panel.Unregister();
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs
index bc9f62161..118cd00da 100755
--- a/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs
@@ -69,13 +69,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
panel.OnContinuousDrawingChanged += OnContinuousDrawingChanged;
panel.OnShowGuidelinesChanged += OnShowGuidelinesChanged;
panel.OnRadialDrawingChanged += OnRadialDrawingChanged;
- panel.OnDrawThingsAtVerticesChanged += OnDrawThingsAtVerticesChanged;
+ panel.OnPlaceThingsAtVerticesChanged += OnPlaceThingsAtVerticesChanged;
// Needs to be set after adding the OnContinuousDrawingChanged event...
panel.ContinuousDrawing = General.Settings.ReadPluginSetting("drawellipsemode.continuousdrawing", false);
panel.ShowGuidelines = General.Settings.ReadPluginSetting("drawellipsemode.showguidelines", false);
panel.RadialDrawing = General.Settings.ReadPluginSetting("drawellipsemode.radialdrawing", false);
- panel.DrawThingsAtVertices = General.Settings.ReadPluginSetting("drawellipsemode.drawthingsatvertices", false);
+ panel.PlaceThingsAtVertices = General.Settings.ReadPluginSetting("drawellipsemode.placethingsatvertices", false);
}
override protected void AddInterface()
@@ -92,7 +92,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Settings.WritePluginSetting("drawellipsemode.continuousdrawing", panel.ContinuousDrawing);
General.Settings.WritePluginSetting("drawellipsemode.showguidelines", panel.ShowGuidelines);
General.Settings.WritePluginSetting("drawellipsemode.radialdrawing", panel.RadialDrawing);
- General.Settings.WritePluginSetting("drawellipsemode.drawthingsatvertices", panel.DrawThingsAtVertices);
+ General.Settings.WritePluginSetting("drawellipsemode.placethingsatvertices", panel.PlaceThingsAtVertices);
// Remove the buttons
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
index 95aac275d..80e428c24 100755
--- a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
@@ -65,7 +65,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
protected bool autoclosedrawing; //mxd. Finish drawing when new points and existing geometry form a closed shape
protected bool drawingautoclosed; //mxd
protected bool showguidelines; //mxd
- protected bool drawthingsatvertices; //sphere: place things at vertices?
+ protected bool placethingsatvertices; //sphere: place things at vertices?
//mxd. Map area bounds
private Line2D top, bottom, left, right;
@@ -954,9 +954,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.RedrawDisplay();
}
- protected void OnDrawThingsAtVerticesChanged(object value, EventArgs e)
+ protected void OnPlaceThingsAtVerticesChanged(object value, EventArgs e)
{
- drawthingsatvertices = (bool)value;
+ placethingsatvertices = (bool)value;
General.Interface.RedrawDisplay();
}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
index f83c96f73..6a5da3589 100755
--- a/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
@@ -104,13 +104,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
panel.OnContinuousDrawingChanged += OnContinuousDrawingChanged;
panel.OnShowGuidelinesChanged += OnShowGuidelinesChanged;
panel.OnRadialDrawingChanged += OnRadialDrawingChanged;
- panel.OnDrawThingsAtVerticesChanged += OnDrawThingsAtVerticesChanged;
+ panel.OnPlaceThingsAtVerticesChanged += OnPlaceThingsAtVerticesChanged;
// Needs to be set after adding the OnContinuousDrawingChanged event...
panel.ContinuousDrawing = General.Settings.ReadPluginSetting("drawrectanglemode.continuousdrawing", false);
panel.ShowGuidelines = General.Settings.ReadPluginSetting("drawrectanglemode.showguidelines", false);
panel.RadialDrawing = General.Settings.ReadPluginSetting("drawrectanglemode.radialdrawing", false);
- panel.DrawThingsAtVertices = General.Settings.ReadPluginSetting("drawrectanglemode.drawthingsatvertices", false);
+ panel.PlaceThingsAtVertices = General.Settings.ReadPluginSetting("drawrectanglemode.placethingsatvertices", false);
}
protected override void AddInterface()
@@ -126,7 +126,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Settings.WritePluginSetting("drawrectanglemode.continuousdrawing", panel.ContinuousDrawing);
General.Settings.WritePluginSetting("drawrectanglemode.showguidelines", panel.ShowGuidelines);
General.Settings.WritePluginSetting("drawrectanglemode.radialdrawing", panel.RadialDrawing);
- General.Settings.WritePluginSetting("drawrectanglemode.drawthingsatvertices", panel.DrawThingsAtVertices);
+ General.Settings.WritePluginSetting("drawrectanglemode.placethingsatvertices", panel.PlaceThingsAtVertices);
// Remove the buttons
panel.Unregister();
@@ -176,8 +176,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
RenderGuidelines(startrotated, endrotated, General.Colors.Guideline.WithAlpha(80), -General.Map.Grid.GridRotate);
//render shape
- for(int i = 1; i < shape.Length; i++)
- renderer.RenderLine(shape[i - 1], shape[i], LINE_THICKNESS, color, true);
+ if (!placethingsatvertices)
+ {
+ for (int i = 1; i < shape.Length; i++)
+ renderer.RenderLine(shape[i - 1], shape[i], LINE_THICKNESS, color, true);
+ }
//vertices
for(int i = 0; i < shape.Length; i++)
@@ -443,7 +446,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.DisplayStatus(StatusType.Action, "Created " + a + word + " " + shapename + ".");
// Make the drawing
- if (drawthingsatvertices)
+ if (placethingsatvertices)
{
List<Vector2D> verts = new List<Vector2D>();
for (int i = 0; i < points.Count; i++)
diff --git a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs
index 201507c81..46fab6a73 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs
@@ -31,7 +31,7 @@
this.toolstrip = new System.Windows.Forms.ToolStrip();
this.continuousdrawing = new System.Windows.Forms.ToolStripButton();
this.autoclosedrawing = new System.Windows.Forms.ToolStripButton();
- this.drawthingsatvertices = new System.Windows.Forms.ToolStripButton();
+ this.placethingsatvertices = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.seglabel = new System.Windows.Forms.ToolStripLabel();
this.seglen = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
@@ -44,7 +44,7 @@
this.toolstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.continuousdrawing,
this.autoclosedrawing,
- this.drawthingsatvertices,
+ this.placethingsatvertices,
this.toolStripSeparator1,
this.seglabel,
this.seglen,
@@ -76,15 +76,15 @@
this.autoclosedrawing.Text = "Auto-close drawing";
this.autoclosedrawing.CheckedChanged += new System.EventHandler(this.autoclosedrawing_CheckedChanged);
//
- // drawthingsatvertices
+ // placethingsatvertices
//
- this.drawthingsatvertices.CheckOnClick = true;
- this.drawthingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
- this.drawthingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.drawthingsatvertices.Name = "drawthingsatvertices";
- this.drawthingsatvertices.Size = new System.Drawing.Size(135, 22);
- this.drawthingsatvertices.Text = "Place things";
- this.drawthingsatvertices.CheckedChanged += new System.EventHandler(this.drawthingsatvertices_CheckedChanged);
+ this.placethingsatvertices.CheckOnClick = true;
+ this.placethingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+ this.placethingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.placethingsatvertices.Name = "placethingsatvertices";
+ this.placethingsatvertices.Size = new System.Drawing.Size(135, 22);
+ this.placethingsatvertices.Text = "Place things";
+ this.placethingsatvertices.CheckedChanged += new System.EventHandler(this.placethingsatvertices_CheckedChanged);
//
// toolStripSeparator1
//
@@ -154,6 +154,6 @@
private System.Windows.Forms.ToolStripButton continuousdrawing;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton autoclosedrawing;
- private System.Windows.Forms.ToolStripButton drawthingsatvertices;
+ private System.Windows.Forms.ToolStripButton placethingsatvertices;
}
}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs
index e47cf964b..059e28345 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs
@@ -8,13 +8,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
public event EventHandler OnValueChanged;
public event EventHandler OnContinuousDrawingChanged;
public event EventHandler OnAutoCloseDrawingChanged;
- public event EventHandler OnDrawThingsAtVerticesChanged;
+ public event EventHandler OnPlaceThingsAtVerticesChanged;
private bool blockevents;
public int SegmentLength { get { return (int)seglen.Value; } set { blockevents = true; seglen.Value = value; blockevents = false; } }
public bool ContinuousDrawing { get { return continuousdrawing.Checked; } set { continuousdrawing.Checked = value; } }
public bool AutoCloseDrawing { get { return autoclosedrawing.Checked; } set { autoclosedrawing.Checked = value; } }
- public bool DrawThingsAtVertices { get { return drawthingsatvertices.Checked; } set { drawthingsatvertices.Checked = value; } }
+ public bool PlaceThingsAtVertices { get { return placethingsatvertices.Checked; } set { placethingsatvertices.Checked = value; } }
public DrawCurveOptionsPanel(int minLength, int maxLength)
{
@@ -31,7 +31,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.BeginToolbarUpdate();
General.Interface.AddButton(continuousdrawing);
General.Interface.AddButton(autoclosedrawing);
- General.Interface.AddButton(drawthingsatvertices);
+ General.Interface.AddButton(placethingsatvertices);
General.Interface.AddButton(toolStripSeparator1);
General.Interface.AddButton(seglabel);
General.Interface.AddButton(seglen);
@@ -46,7 +46,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.RemoveButton(seglen);
General.Interface.RemoveButton(seglabel);
General.Interface.RemoveButton(toolStripSeparator1);
- General.Interface.RemoveButton(drawthingsatvertices);
+ General.Interface.RemoveButton(placethingsatvertices);
General.Interface.RemoveButton(autoclosedrawing);
General.Interface.RemoveButton(continuousdrawing);
General.Interface.EndToolbarUpdate();
@@ -72,9 +72,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(OnAutoCloseDrawingChanged != null) OnAutoCloseDrawingChanged(autoclosedrawing.Checked, EventArgs.Empty);
}
- private void drawthingsatvertices_CheckedChanged(object sender, EventArgs e)
+ private void placethingsatvertices_CheckedChanged(object sender, EventArgs e)
{
- if (OnDrawThingsAtVerticesChanged != null) OnDrawThingsAtVerticesChanged(drawthingsatvertices.Checked, EventArgs.Empty);
+ if (OnPlaceThingsAtVerticesChanged != null) OnPlaceThingsAtVerticesChanged(placethingsatvertices.Checked, EventArgs.Empty);
}
}
}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs
index d7306af69..4ee927b54 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs
@@ -31,7 +31,7 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.continuousdrawing = new System.Windows.Forms.ToolStripButton();
this.radialdrawing = new System.Windows.Forms.ToolStripButton();
- this.drawthingsatvertices = new System.Windows.Forms.ToolStripButton();
+ this.placethingsatvertices = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.subdivslabel = new System.Windows.Forms.ToolStripLabel();
this.subdivs = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
@@ -50,7 +50,7 @@
this.continuousdrawing,
this.showguidelines,
this.radialdrawing,
- this.drawthingsatvertices,
+ this.placethingsatvertices,
this.toolStripSeparator1,
this.subdivslabel,
this.subdivs,
@@ -75,15 +75,15 @@
this.continuousdrawing.Text = "Continuous drawing";
this.continuousdrawing.CheckedChanged += new System.EventHandler(this.continuousdrawing_CheckedChanged);
//
- // drawthingsatvertices
+ // placethingsatvertices
//
- this.drawthingsatvertices.CheckOnClick = true;
- this.drawthingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
- this.drawthingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.drawthingsatvertices.Name = "drawthingsatvertices";
- this.drawthingsatvertices.Size = new System.Drawing.Size(135, 22);
- this.drawthingsatvertices.Text = "Place things";
- this.drawthingsatvertices.CheckedChanged += new System.EventHandler(this.drawthingsatvertices_CheckedChanged);
+ this.placethingsatvertices.CheckOnClick = true;
+ this.placethingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+ this.placethingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.placethingsatvertices.Name = "placethingsatvertices";
+ this.placethingsatvertices.Size = new System.Drawing.Size(135, 22);
+ this.placethingsatvertices.Text = "Place things";
+ this.placethingsatvertices.CheckedChanged += new System.EventHandler(this.placethingsatvertices_CheckedChanged);
//
// toolStripSeparator1
//
@@ -237,6 +237,6 @@
private System.Windows.Forms.ToolStripLabel anglelabel;
private CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown angle;
private System.Windows.Forms.ToolStripButton showguidelines;
- private System.Windows.Forms.ToolStripButton drawthingsatvertices;
+ private System.Windows.Forms.ToolStripButton placethingsatvertices;
}
}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs
index fab8a8719..309d73b23 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs
@@ -9,7 +9,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public event EventHandler OnContinuousDrawingChanged;
public event EventHandler OnShowGuidelinesChanged;
public event EventHandler OnRadialDrawingChanged;
- public event EventHandler OnDrawThingsAtVerticesChanged;
+ public event EventHandler OnPlaceThingsAtVerticesChanged;
private bool blockevents;
@@ -23,7 +23,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public bool ContinuousDrawing { get { return continuousdrawing.Checked; } set { continuousdrawing.Checked = value; } }
public bool ShowGuidelines { get { return showguidelines.Checked; } set { showguidelines.Checked = value; } }
public bool RadialDrawing { get { return radialdrawing.Checked; } set { radialdrawing.Checked = value; } }
- public bool DrawThingsAtVertices { get { return drawthingsatvertices.Checked; } set { drawthingsatvertices.Checked = value; } }
+ public bool PlaceThingsAtVertices { get { return placethingsatvertices.Checked; } set { placethingsatvertices.Checked = value; } }
public DrawEllipseOptionsPanel()
{
@@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.AddButton(continuousdrawing);
General.Interface.AddButton(showguidelines);
General.Interface.AddButton(radialdrawing);
- General.Interface.AddButton(drawthingsatvertices);
+ General.Interface.AddButton(placethingsatvertices);
General.Interface.AddButton(toolStripSeparator1);
General.Interface.AddButton(subdivslabel);
General.Interface.AddButton(subdivs);
@@ -66,7 +66,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.RemoveButton(showguidelines);
General.Interface.RemoveButton(continuousdrawing);
General.Interface.RemoveButton(radialdrawing);
- General.Interface.RemoveButton(drawthingsatvertices);
+ General.Interface.RemoveButton(placethingsatvertices);
General.Interface.EndToolbarUpdate();
}
@@ -103,9 +103,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(OnRadialDrawingChanged != null) OnRadialDrawingChanged(radialdrawing.Checked, EventArgs.Empty);
}
- private void drawthingsatvertices_CheckedChanged(object sender, EventArgs e)
+ private void placethingsatvertices_CheckedChanged(object sender, EventArgs e)
{
- if (OnDrawThingsAtVerticesChanged != null) OnDrawThingsAtVerticesChanged(drawthingsatvertices.Checked, EventArgs.Empty);
+ if (OnPlaceThingsAtVerticesChanged != null) OnPlaceThingsAtVerticesChanged(placethingsatvertices.Checked, EventArgs.Empty);
}
}
}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs
index 9959e9997..bfaae798b 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs
@@ -32,7 +32,7 @@
this.continuousdrawing = new System.Windows.Forms.ToolStripButton();
this.showguidelines = new System.Windows.Forms.ToolStripButton();
this.radialdrawing = new System.Windows.Forms.ToolStripButton();
- this.drawthingsatvertices = new System.Windows.Forms.ToolStripButton();
+ this.placethingsatvertices = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.radiuslabel = new System.Windows.Forms.ToolStripLabel();
this.radius = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
@@ -48,7 +48,7 @@
this.continuousdrawing,
this.showguidelines,
this.radialdrawing,
- this.drawthingsatvertices,
+ this.placethingsatvertices,
this.toolStripSeparator1,
this.radiuslabel,
this.radius,
@@ -71,15 +71,15 @@
this.continuousdrawing.Text = "Continuous drawing";
this.continuousdrawing.CheckedChanged += new System.EventHandler(this.continuousdrawing_CheckedChanged);
//
- // drawthingsatvertices
+ // placethingsatvertices
//
- this.drawthingsatvertices.CheckOnClick = true;
- this.drawthingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
- this.drawthingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.drawthingsatvertices.Name = "drawthingsatvertices";
- this.drawthingsatvertices.Size = new System.Drawing.Size(135, 22);
- this.drawthingsatvertices.Text = "Place things";
- this.drawthingsatvertices.CheckedChanged += new System.EventHandler(this.drawthingsatvertices_CheckedChanged);
+ this.placethingsatvertices.CheckOnClick = true;
+ this.placethingsatvertices.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+ this.placethingsatvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.placethingsatvertices.Name = "placethingsatvertices";
+ this.placethingsatvertices.Size = new System.Drawing.Size(135, 22);
+ this.placethingsatvertices.Text = "Place things";
+ this.placethingsatvertices.CheckedChanged += new System.EventHandler(this.placethingsatvertices_CheckedChanged);
//
// showguidelines
//
@@ -202,6 +202,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton showguidelines;
private System.Windows.Forms.ToolStripButton radialdrawing;
- private System.Windows.Forms.ToolStripButton drawthingsatvertices;
+ private System.Windows.Forms.ToolStripButton placethingsatvertices;
}
}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs
index 4a6144880..efbfaa4e7 100755
--- a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs
+++ b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs
@@ -9,7 +9,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public event EventHandler OnContinuousDrawingChanged;
public event EventHandler OnShowGuidelinesChanged;
public event EventHandler OnRadialDrawingChanged;
- public event EventHandler OnDrawThingsAtVerticesChanged;
+ public event EventHandler OnPlaceThingsAtVerticesChanged;
private bool blockevents;
@@ -22,7 +22,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public bool ContinuousDrawing { get { return continuousdrawing.Checked; } set { continuousdrawing.Checked = value; } }
public bool ShowGuidelines { get { return showguidelines.Checked; } set { showguidelines.Checked = value; } }
public bool RadialDrawing { get { return radialdrawing.Checked; } set { radialdrawing.Checked = value; } }
- public bool DrawThingsAtVertices { get { return drawthingsatvertices.Checked; } set { drawthingsatvertices.Checked = value; } }
+ public bool PlaceThingsAtVertices { get { return placethingsatvertices.Checked; } set { placethingsatvertices.Checked = value; } }
public DrawRectangleOptionsPanel()
{
@@ -38,7 +38,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.AddButton(continuousdrawing);
General.Interface.AddButton(showguidelines);
General.Interface.AddButton(radialdrawing);
- General.Interface.AddButton(drawthingsatvertices);
+ General.Interface.AddButton(placethingsatvertices);
General.Interface.AddButton(toolStripSeparator1);
General.Interface.AddButton(radiuslabel);
General.Interface.AddButton(radius);
@@ -58,7 +58,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.RemoveButton(radiuslabel);
General.Interface.RemoveButton(toolStripSeparator1);
General.Interface.RemoveButton(showguidelines);
- General.Interface.RemoveButton(drawthingsatvertices);
+ General.Interface.RemoveButton(placethingsatvertices);
General.Interface.RemoveButton(continuousdrawing);
General.Interface.RemoveButton(radialdrawing);
General.Interface.EndToolbarUpdate();
@@ -96,9 +96,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(OnRadialDrawingChanged != null) OnRadialDrawingChanged(radialdrawing.Checked, EventArgs.Empty);
}
- private void drawthingsatvertices_CheckedChanged(object sender, EventArgs e)
+ private void placethingsatvertices_CheckedChanged(object sender, EventArgs e)
{
- if (OnDrawThingsAtVerticesChanged != null) OnDrawThingsAtVerticesChanged(drawthingsatvertices.Checked, EventArgs.Empty);
+ if (OnPlaceThingsAtVerticesChanged != null) OnPlaceThingsAtVerticesChanged(placethingsatvertices.Checked, EventArgs.Empty);
}
}
}
--
GitLab