From 533d56eb6a5c3bbccedd92d86c38a58b8ab51158 Mon Sep 17 00:00:00 2001 From: wisselstem <36791160+spherallic@users.noreply.github.com> Date: Fri, 26 May 2023 20:53:36 +0200 Subject: [PATCH 1/3] Preferences form: added Tab to the list of special input controls (#886) --- Source/Core/Windows/PreferencesForm.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index 88cc3b72..1ea35b3a 100755 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -633,8 +633,10 @@ namespace CodeImp.DoomBuilder.Windows private void FillControlsList(Action a) { actioncontrol.Items.Clear(); - + // Fill combobox with special controls + actioncontrol.Items.Add(new KeyControl(Keys.Tab, "Tab")); + if(a.AllowMouse) { actioncontrol.Items.Add(new KeyControl(Keys.LButton, "LButton")); From d2a4dcffcefca28f36ce7454a122b3731172b254 Mon Sep 17 00:00:00 2001 From: wisselstem <36791160+spherallic@users.noreply.github.com> Date: Fri, 26 May 2023 20:56:30 +0200 Subject: [PATCH 2/3] Edit Selection Mode: added actions for moving the selection around the grid (#888) --- .../ClassicModes/EditSelectionMode.cs | 48 +++++++++++++++++++ .../BuilderModes/Resources/Actions.cfg | 44 +++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs index 0cc55cf4..d9de9c4e 100755 --- a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs @@ -2298,6 +2298,54 @@ namespace CodeImp.DoomBuilder.BuilderModes General.Interface.RedrawDisplay(); } + [BeginAction("moveselectionup")] + public void MoveSelectionUp() + { + offset.y += General.Map.Grid.GridSize; + + // Update + UpdateGeometry(); + UpdateRectangleComponents(); + General.Map.Map.Update(); + General.Interface.RedrawDisplay(); + } + + [BeginAction("moveselectiondown")] + public void MoveSelectionDown() + { + offset.y -= General.Map.Grid.GridSize; + + // Update + UpdateGeometry(); + UpdateRectangleComponents(); + General.Map.Map.Update(); + General.Interface.RedrawDisplay(); + } + + [BeginAction("moveselectionleft")] + public void MoveSelectionLeft() + { + offset.x -= General.Map.Grid.GridSize; + + // Update + UpdateGeometry(); + UpdateRectangleComponents(); + General.Map.Map.Update(); + General.Interface.RedrawDisplay(); + } + + [BeginAction("moveselectionright")] + public void MoveSelectionRight() + { + offset.x += General.Map.Grid.GridSize; + + // Update + UpdateGeometry(); + UpdateRectangleComponents(); + General.Map.Map.Update(); + General.Interface.RedrawDisplay(); + } + #endregion } } diff --git a/Source/Plugins/BuilderModes/Resources/Actions.cfg b/Source/Plugins/BuilderModes/Resources/Actions.cfg index 050a66ea..8b640fd1 100755 --- a/Source/Plugins/BuilderModes/Resources/Actions.cfg +++ b/Source/Plugins/BuilderModes/Resources/Actions.cfg @@ -1268,6 +1268,50 @@ flipselectionh allowscroll = true; } +moveselectionup +{ + title = "Move Selection Up by Grid Size"; + category = "edit"; + description = "Moves the selection in Edit Selection mode up by the current grid size."; + allowkeys = true; + allowmouse = true; + allowscroll = true; + repeat = true; +} + +moveselectiondown +{ + title = "Move Selection Down by Grid Size"; + category = "edit"; + description = "Moves the selection in Edit Selection mode down by the current grid size."; + allowkeys = true; + allowmouse = true; + allowscroll = true; + repeat = true; +} + +moveselectionleft +{ + title = "Move Selection Left by Grid Size"; + category = "edit"; + description = "Moves the selection in Edit Selection mode left by the current grid size."; + allowkeys = true; + allowmouse = true; + allowscroll = true; + repeat = true; +} + +moveselectionright +{ + title = "Move Selection Right by Grid Size"; + category = "edit"; + description = "Moves the selection in Edit Selection mode right by the current grid size."; + allowkeys = true; + allowmouse = true; + allowscroll = true; + repeat = true; +} + //mxd rotateclockwise { From 606e43ca35dd547a8993bff02a636f3a294812b1 Mon Sep 17 00:00:00 2001 From: wisselstem <36791160+spherallic@users.noreply.github.com> Date: Fri, 26 May 2023 21:16:38 +0200 Subject: [PATCH 3/3] Stair Sector Builder Mode: fix "Back" option never being checked when loading default preset (#890) --- .../Plugins/StairSectorBuilder/StairSectorBuilderForm.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs index 4bef0b25..1d718a99 100755 --- a/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs +++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs @@ -76,6 +76,12 @@ namespace CodeImp.DoomBuilder.StairSectorBuilderMode set { sidefront.Checked = value; } } + public bool SideBack + { + get { return sideback.Checked; } + set { sideback.Checked = value; } + } + public CheckBox DistinctBaseHeights { get { return distinctbaseheights; } @@ -807,6 +813,9 @@ namespace CodeImp.DoomBuilder.StairSectorBuilderMode SingleDirection.Checked = p.singledirection; DistinctBaseHeights.Checked = p.distinctbaseheights; + if (!SideFront) + SideBack = true; + // Auto curve TODO Flipping = p.flipping;