Add a sidebar toggle to WinForms/Gtk

cyanfish · Aug 19, 2024 · e8e9309 · e8e9309
1 parent 6bc1945
commit e8e9309
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 12 deletions.
diff --git a/NAPS2.Lib.Mac/EtoForms/Mac/MacIconProvider.cs b/NAPS2.Lib.Mac/EtoForms/Mac/MacIconProvider.cs
@@ -44,7 +44,7 @@ public class MacIconProvider : IIconProvider
         { "text_align_justify_small", "text.justify" },
         { "large_tiles_small", "square.grid.2x2" },
         { "exclamation_small", "exclamationmark.triangle" },
-        { "sidebar", "sidebar.left" },
+        { "application_side_list", "sidebar.left" },
         // TODO: Consider these
         // { "ask", "questionmark" },
         // { "network_ip", "wifi.router" },

diff --git a/NAPS2.Lib.Mac/EtoForms/Ui/MacDesktopForm.cs b/NAPS2.Lib.Mac/EtoForms/Ui/MacDesktopForm.cs
@@ -237,5 +237,5 @@ private void ThumbnailController_ThumbnailSizeChanged(object? o, EventArgs event
         _zoomSlider!.DoubleValue = ThumbnailSizes.SizeToCurve(_thumbnailController.VisibleSize);
     }
 
-    protected override LayoutElement GetZoomButtons() => C.Spacer();
+    protected override LayoutElement GetControlButtons() => C.Spacer();
 }
diff --git a/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs b/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs
@@ -89,7 +89,7 @@ protected override void OnShown(EventArgs e)
         base.OnShown(e);
     }
 
-    protected override LayoutElement GetZoomButtons()
+    protected override LayoutElement GetControlButtons()
     {
         // Disabled buttons don't prevent click events from being sent to the listview below the button, so without this
         // "mouse catcher" control you could e.g. spam click zoom out until it's maxed and then accidentally keep
@@ -100,9 +100,12 @@ protected override LayoutElement GetZoomButtons()
             Size = new Size(45, 23),
             FlatStyle = WF.FlatStyle.Flat
         };
-        return L.Overlay(
-            L.Row(mouseCatcher.ToEto().AlignTrailing()),
-            base.GetZoomButtons()
+        return L.Row(
+            GetSidebarButton(),
+            L.Overlay(
+                L.Row(mouseCatcher.ToEto().AlignTrailing()),
+                GetZoomButtons()
+            )
         );
     }
 

diff --git a/NAPS2.Lib.WinForms/EtoForms/WinForms/WinFormsEtoPlatform.cs b/NAPS2.Lib.WinForms/EtoForms/WinForms/WinFormsEtoPlatform.cs
@@ -237,7 +237,7 @@ public override void UpdateRtl(Window window)
 
     public override void ConfigureZoomButton(Button button)
     {
-        button.Size = new Size(23, 23);
+        button.Size = new Size(25, 25);
         var wfButton = (WF.Button) button.ToNative();
         wfButton.AccessibleName = button.Text;
         wfButton.Text = "";

diff --git a/NAPS2.Lib/EtoForms/Ui/DesktopCommands.cs b/NAPS2.Lib/EtoForms/Ui/DesktopCommands.cs
@@ -324,7 +324,7 @@ public DesktopCommands(DesktopController desktopController, DesktopScanControlle
         ToggleSidebar = new ActionCommand(() => _desktopFormProvider.DesktopForm.ToggleSidebar())
         {
             Text = UiStrings.ToggleSidebar,
-            Image = iconProvider.GetIcon("sidebar")
+            Image = iconProvider.GetIcon("application_side_list")
         };
     }
 

diff --git a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
@@ -121,11 +121,11 @@ protected override void BuildLayout()
             LayoutController,
             _sidebar.CreateView(this),
             L.Overlay(
-                GetMainContent(),
+                _listView.Control,
                 L.Column(
                     C.Filler(),
                     L.Row(
-                        GetZoomButtons(),
+                        GetControlButtons(),
                         C.Filler(),
                         _notificationArea.Content)
                 ).Padding(10)
@@ -432,9 +432,19 @@ protected SubMenuItem CreateSubMenu(Command menuCommand, MenuProvider menuProvid
         return menuItem;
     }
 
-    protected virtual LayoutElement GetMainContent() => _listView.Control;
+    protected virtual LayoutElement GetControlButtons()
+    {
+        return L.Row(GetSidebarButton(), GetZoomButtons());
+    }
+
+    protected LayoutElement GetSidebarButton()
+    {
+        var toggleSidebar = C.ImageButton(Commands.ToggleSidebar);
+        EtoPlatform.Current.ConfigureZoomButton(toggleSidebar);
+        return toggleSidebar.AlignTrailing();
+    }
 
-    protected virtual LayoutElement GetZoomButtons()
+    protected LayoutElement GetZoomButtons()
     {
         var zoomIn = C.ImageButton(Commands.ZoomIn);
         EtoPlatform.Current.ConfigureZoomButton(zoomIn);

diff --git a/NAPS2.Lib/Icons.Designer.cs b/NAPS2.Lib/Icons.Designer.cs
diff --git a/NAPS2.Lib/Icons.resx b/NAPS2.Lib/Icons.resx
@@ -469,4 +469,7 @@
   <data name="shape_align_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\shape_align_right.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="application_side_list" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\application_side_list.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/NAPS2.Lib/Icons/application_side_list.png b/NAPS2.Lib/Icons/application_side_list.png