From 5e2606f679f2d5d9ede329e236fd737a94da1b14 Mon Sep 17 00:00:00 2001
From: AJ Isaacs <ajisaacs27@gmail.com>
Date: Sun, 1 Nov 2026 14:07:33 -0500
Subject: [PATCH] Add a Zoom To Area button to the plate header

The header gets a fourth zoom button that starts the existing Zoom Window
action, with a matching dashed-window icon also shown on View > Zoom To >
Area. It stays out of the inspection's live zoom controls: inspection owns
Escape, so a zoom window could not be cancelled there.
---
 .../Forms/CuttingValidationPanelTests.cs      |  27 ++++++++++++++++++
 OpenNest/Forms/EditNestForm.cs                |  11 +++++--
 OpenNest/Forms/MainForm.Designer.cs           |   1 +
 OpenNest/Properties/Resources.Designer.cs     |   7 +++++
 OpenNest/Properties/Resources.resx            |   3 ++
 OpenNest/Resources/zoom_area.png              | Bin 0 -> 781 bytes
 6 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 OpenNest/Resources/zoom_area.png

diff --git a/OpenNest.WinForms.Tests/Forms/CuttingValidationPanelTests.cs b/OpenNest.WinForms.Tests/Forms/CuttingValidationPanelTests.cs
index 9bfdbab1..837c2594 100644
--- a/OpenNest.WinForms.Tests/Forms/CuttingValidationPanelTests.cs
+++ b/OpenNest.WinForms.Tests/Forms/CuttingValidationPanelTests.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using System.Reflection;
 using System.Windows.Forms;
+using OpenNest.Actions;
 using OpenNest.CNC;
 using OpenNest.Diagnostics;
 using OpenNest.Forms;
@@ -321,6 +322,32 @@ public class CuttingValidationPanelTests
         Assert.Equal(1, editor.PlateManager.CurrentIndex);
     });
 
+    [Fact]
+    public void HeaderZoomToAreaStartsZoomWindowButIsLockedDuringInspection() => RunSta(() =>
+    {
+        using var editor = RapidEditor();
+        editor.Show();
+        editor.PlateManager.LoadAt(0);
+        var view = editor.PlateView;
+        var area = Assert.IsType<Button>(editor.Controls.Find("btnZoomToArea", true).Single());
+        Assert.Equal("Zoom To Area", area.AccessibleName);
+        Assert.NotNull(area.Image);
+
+        area.PerformClick();
+        Assert.IsType<ActionZoomWindow>(view.Actions.CurrentAction);
+
+        // Inspection owns Escape, so a zoom window could not be cancelled there.
+        view.SetAction(typeof(ActionSelect));
+        editor.OpenValidationInspection();
+        var panel = editor.CuttingInspection!;
+        Pump(() => panel.ValidationReport != null && !panel.IsPlanning);
+        Assert.False(area.Enabled);
+        area.PerformClick();
+        Assert.IsType<ActionSelect>(view.Actions.CurrentAction);
+        panel.RequestClose();
+        Assert.True(area.Enabled);
+    });
+
     private static void InvokeView(Control target, string name, params object[] args) => target.GetType()
         .GetMethod(name, BindingFlags.NonPublic | BindingFlags.Instance)!.Invoke(target, args);
 
diff --git a/OpenNest/Forms/EditNestForm.cs b/OpenNest/Forms/EditNestForm.cs
index 5554050a..908c4c0d 100644
--- a/OpenNest/Forms/EditNestForm.cs
+++ b/OpenNest/Forms/EditNestForm.cs
@@ -153,15 +153,21 @@ namespace OpenNest.Forms
             zoomToFitButton.AccessibleName = "Zoom To Fit";
             zoomToFitButton.Click += (s, e) => PlateView.ZoomToFit();
 
+            var zoomToAreaButton = CreateNavButton(Resources.zoom_area);
+            zoomToAreaButton.Name = "btnZoomToArea";
+            zoomToAreaButton.AccessibleName = "Zoom To Area";
+            zoomToAreaButton.Click += (s, e) => PlateView.SetAction(typeof(ActionZoomWindow));
+
             var toolTip = new ToolTip(components);
             toolTip.SetToolTip(zoomOutButton, "Zoom Out (Ctrl+Minus)");
             toolTip.SetToolTip(zoomInButton, "Zoom In (Ctrl+Plus)");
             toolTip.SetToolTip(zoomToFitButton, "Zoom To Fit (F)");
+            toolTip.SetToolTip(zoomToAreaButton, "Zoom To Area");
 
             // Keep navigation and zoom controls together in the header.
             var navPanel = new Panel
             {
-                Width = btnSize.Width * 7 + 8,
+                Width = btnSize.Width * 8 + 8,
                 Height = btnSize.Height,
                 Anchor = AnchorStyles.None,
             };
@@ -181,6 +187,7 @@ namespace OpenNest.Forms
             zoomOutButton.Location = new Point(btnSize.Width * 4 + 8, 0);
             zoomInButton.Location = new Point(btnSize.Width * 5 + 8, 0);
             zoomToFitButton.Location = new Point(btnSize.Width * 6 + 8, 0);
+            zoomToAreaButton.Location = new Point(btnSize.Width * 7 + 8, 0);
 
             var separator = new Panel
             {
@@ -193,7 +200,7 @@ namespace OpenNest.Forms
             navPanel.Controls.AddRange(
                 new Control[]
                 {
-                    plateButtons, separator, zoomOutButton, zoomInButton, zoomToFitButton
+                    plateButtons, separator, zoomOutButton, zoomInButton, zoomToFitButton, zoomToAreaButton
                 }
             );
 
diff --git a/OpenNest/Forms/MainForm.Designer.cs b/OpenNest/Forms/MainForm.Designer.cs
index 92c27cb3..0c6331e7 100644
--- a/OpenNest/Forms/MainForm.Designer.cs
+++ b/OpenNest/Forms/MainForm.Designer.cs
@@ -520,6 +520,7 @@ namespace OpenNest.Forms
             // 
             // mnuViewZoomToArea
             // 
+            mnuViewZoomToArea.Image = Properties.Resources.zoom_area;
             mnuViewZoomToArea.Name = "mnuViewZoomToArea";
             mnuViewZoomToArea.Size = new System.Drawing.Size(118, 22);
             mnuViewZoomToArea.Text = "Area";
diff --git a/OpenNest/Properties/Resources.Designer.cs b/OpenNest/Properties/Resources.Designer.cs
index 64d6cc4d..806bca31 100644
--- a/OpenNest/Properties/Resources.Designer.cs
+++ b/OpenNest/Properties/Resources.Designer.cs
@@ -338,6 +338,13 @@ namespace OpenNest.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap zoom_area {
+            get {
+                object obj = ResourceManager.GetObject("zoom_area", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/OpenNest/Properties/Resources.resx b/OpenNest/Properties/Resources.resx
index 32079617..2b17959f 100644
--- a/OpenNest/Properties/Resources.resx
+++ b/OpenNest/Properties/Resources.resx
@@ -145,6 +145,9 @@
   <data name="zoom_all" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoom_all.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="zoom_area" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zoom_area.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="move_first" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\move_first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/OpenNest/Resources/zoom_area.png b/OpenNest/Resources/zoom_area.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b826d53f972bab9b8b5e95e36368bc137d850c
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0008iNkl<Zc-rli
zO-NKx6vuz}y_qyai@uaVYKRCkDoLgc@)3a)WkeBu7+BDvg-}t8S_Ey}6fJ@wq)m&o
zf?8-2$xu|<YKX>6`@l?Xo>VsGOf!w+_};xOYOFy`C#qHd)&Jge&-veb?mg$ie@p_A
zB-_r_DS)anHy*E#sd4~eX|9G-dwV7os9e921+#OA3=IR2Jw0Pm?(zDjCg6SAsj{bM
zpb3#y3c|5CwzOQEiwedS(2~UC^^NW-9eBJxYMNRnv}^zDlK)nU96ukms?5#Itju2q
zlv2|5`VFROB5g@a;1dqzbWF6~k<M<-fJxnzYXpM>Df0?ijPm^lA2!xD{dS7XfJx28
zOAHSu$jhCNyLc74rsHpGr>8f70!v7HXY=jrw|@51M{~J&?U_{z^T-_Mv{FiHE?y!M
ziL#+|9j8woqiE%FRxB@|Y@>mck{2&KHHFwZV^03npxGHt>lJl%y&)JJATM`5hYwYv
z>#1&gc5SDyU@1a~?92@3VGP4Du7JnuBOHrUUEfS~ee)>4($oTgySQjf@FYsstOme2
z%~_b$9i2Dkl7*$Y0BmU?tZzY*Jl^-V3OGJdZ~$E!wduMga)5U!0?A&|aO#Isk{jjw
z9)LLB`m~*j-8;q=@V9jUFfwAjR!WKVDtWf^u7da7y#cP@s2^j#_uvt}$9|Mjc7Ojs
z^E53H9rH{lgHgVJlSDNNa1<6SrNq4&P1k5`>%jNe55Qn3#OHA2X0H{j;Q8}JS^@y2
zTPn6Gp=yN?*(rsllpP9(^)Fvy-^X0&_TN96QU_B(Z|AdDGv?%9m9`yMs6orNyN2TN
zJ7(X9^CO9brfJ$T03ldAE6=qk^uDJ-{8o!J3`bUXbe?V{a+FfS)<kq@rrqz#$UQ3r
zN0Q4vN8*O~)9u++wBfQ49FS5z`S>w(Li~+CVD6HV(xF&PSBk-}uzyhO(kNC}00000
LNkvXXu0mjft_gKF

literal 0
HcmV?d00001