From 0859264a48ba6278dab37faebfe64e836939cd67 Mon Sep 17 00:00:00 2001
From: Sam Johnson <sam@scj.me>
Date: Tue, 26 Nov 2024 00:41:30 -0600
Subject: [PATCH] Improve settings for vertical taskbar width

---
 RetroBar/Languages/English.xaml   |  2 +-
 RetroBar/PropertiesWindow.xaml    | 18 ++++++++++++------
 RetroBar/PropertiesWindow.xaml.cs | 18 ++++++------------
 RetroBar/Taskbar.xaml.cs          | 12 ++++++------
 RetroBar/Utilities/Settings.cs    | 16 ++++++++--------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index e9b2c213..b7f832b9 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -22,7 +22,7 @@
     </x:Array>
     <s:String x:Key="rowcount_text">Number of _rows:</s:String>
     <s:String x:Key="rowcount_tip">The number of rows on the taskbar when on top or bottom.</s:String>
-    <s:String x:Key="rowcount_vertical_tip">The number of rows on the taskbar when on left or right.</s:String>
+    <s:String x:Key="taskbar_width">Taskba_r width:</s:String>
     <s:String x:Key="allow_font_smoothing">_Allow font smoothing</s:String>
     <s:String x:Key="collapse_tray_icons">Collapse _notification area icons</s:String>
     <s:String x:Key="customize">_Customize...</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 0b7e14ed..3644078d 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -217,13 +217,19 @@
                             </DockPanel>
                             <DockPanel Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, Converter={StaticResource edgeOrientationVisibilityConverter}, ConverterParameter='vertical'}">
                                 <Label VerticalAlignment="Center"
-                                       Target="{Binding ElementName=cboRowCountVertical}">
-                                    <AccessText Text="{DynamicResource rowcount_text}"
-                                                ToolTip="{DynamicResource rowcount_vertical_tip}" />
+                                       Target="{Binding ElementName=sldTaskbarWidth}">
+                                    <AccessText Text="{DynamicResource taskbar_width}" />
                                 </Label>
-                                <ComboBox x:Name="cboRowCountVertical"
-                                          SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=RowCountVertical, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource countToIndexConverter}}"
-                                          SelectionChanged="cboRowCountVertical_SelectionChanged" />
+                                <Slider Name="sldTaskbarWidth"
+                                        Orientation="Horizontal"
+                                        IsSnapToTickEnabled="True"
+                                        Value="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskbarWidth, UpdateSourceTrigger=PropertyChanged}"
+                                        Minimum="1"
+                                        TickFrequency="1"
+                                        TickPlacement="BottomRight"
+                                        HorizontalAlignment="Right"
+                                        Margin="0,3,0,4"
+                                        Width="200" />
                             </DockPanel>
                             <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=AllowFontSmoothing, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource allow_font_smoothing}" />
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 908dfb9b..f4afb321 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -81,6 +81,7 @@ private PropertiesWindow(NotificationArea notificationArea, DictionaryManager di
             LoadRows();
             LoadThemes();
             LoadVersion();
+            LoadWidth();
 
             Settings.Instance.PropertyChanged += Settings_PropertyChanged;
         }
@@ -170,10 +171,6 @@ private void LoadRows()
             {
                 cboRowCount.Items.Add(i.ToString());
             }
-            for (int i = 1; i <= Settings.Instance.RowLimitVertical; i++)
-            {
-                cboRowCountVertical.Items.Add(i.ToString());
-            }
         }
 
         private void LoadThemes()
@@ -189,6 +186,11 @@ private void LoadVersion()
             txtVersion.Text = string.Format((string)FindResource("version"), System.Windows.Forms.Application.ProductVersion);
         }
 
+        private void LoadWidth()
+        {
+            sldTaskbarWidth.Maximum = Settings.Instance.TaskbarWidthLimit;
+        }
+
         private void UpdateWindowPosition()
         {
             switch (Settings.Instance.Edge)
@@ -317,14 +319,6 @@ private void cboRowCount_SelectionChanged(object sender, System.Windows.Controls
             }
         }
 
-        private void cboRowCountVertical_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (cboRowCountVertical.SelectedItem == null)
-            {
-                cboRowCountVertical.SelectedValue = cboRowCountVertical.Items[Settings.Instance.RowCountVertical - 1];
-            }
-        }
-
         private void CustomizeNotifications_OnClick(object sender, RoutedEventArgs e)
         {
             OpenCustomizeNotifications();
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
index 73d69f7f..99bddbc3 100644
--- a/RetroBar/Taskbar.xaml.cs
+++ b/RetroBar/Taskbar.xaml.cs
@@ -159,7 +159,7 @@ private void RecalculateSize(bool performResize = true)
         {
             _unlockedMargin = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0);
             DesiredRowHeight = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarRowHeight") as double? ?? 0);
-            double newWidth = (Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarWidth") as double? ?? 0)) + DesiredRowHeight * (Settings.Instance.RowCountVertical - 1);
+            double newWidth = (Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarWidth") as double? ?? 0)) + DesiredRowHeight * (Settings.Instance.TaskbarWidth - 1);
             double newHeight = (Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarHeight") as double? ?? 0)) + DesiredRowHeight * (Rows - 1);
 
             if (AppBarMode == AppBarMode.AutoHide || !Settings.Instance.LockTaskbar)
@@ -278,7 +278,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
                 RecalculateSize();
                 OnPropertyChanged(nameof(Rows));
             }
-            else if (e.PropertyName == nameof(Settings.RowCountVertical))
+            else if (e.PropertyName == nameof(Settings.TaskbarWidth))
             {
                 PeekDuringAutoHide();
                 RecalculateSize();
@@ -593,15 +593,15 @@ private void MouseDragHook_LowLevelMouseEvent(object sender, LowLevelMouseHook.L
                                 double taskbarEdge = AppBarEdge == AppBarEdge.Left ? Screen.Bounds.Left + (DesiredWidth * DpiScale) : Screen.Bounds.Right - (DesiredWidth * DpiScale);
                                 if ((AppBarEdge == AppBarEdge.Left && mouseX > taskbarEdge + scaledRowHeight ||
                                      AppBarEdge == AppBarEdge.Right && mouseX < taskbarEdge - scaledRowHeight) &&
-                                    Settings.Instance.RowCountVertical < Settings.Instance.RowLimitVertical)
+                                    Settings.Instance.TaskbarWidth < Settings.Instance.TaskbarWidthLimit)
                                 {
-                                    Settings.Instance.RowCountVertical += 1;
+                                    Settings.Instance.TaskbarWidth += 1;
                                 }
                                 else if ((AppBarEdge == AppBarEdge.Left && mouseX < taskbarEdge - SystemParameters.MinimumHorizontalDragDistance ||
                                           AppBarEdge == AppBarEdge.Right && mouseX > taskbarEdge + SystemParameters.MinimumHorizontalDragDistance) &&
-                                    Settings.Instance.RowCountVertical > 1)
+                                    Settings.Instance.TaskbarWidth > 1)
                                 {
-                                    Settings.Instance.RowCountVertical -= 1;
+                                    Settings.Instance.TaskbarWidth -= 1;
                                 }
                             }
                         });
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 07b761a7..1e165d28 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -220,18 +220,18 @@ public int RowLimit
             set => Set(ref _rowLimit, value);
         }
 
-        private int _rowCountVertical = 1;
-        public int RowCountVertical
+        private int _taskbarWidth = 1;
+        public int TaskbarWidth
         {
-            get => _rowCountVertical;
-            set => Set(ref _rowCountVertical, value);
+            get => _taskbarWidth;
+            set => Set(ref _taskbarWidth, value);
         }
 
-        private int _rowLimitVertical = 7;
-        public int RowLimitVertical
+        private int _taskbarWidthLimit = 7;
+        public int TaskbarWidthLimit
         {
-            get => _rowLimitVertical;
-            set => Set(ref _rowLimitVertical, value);
+            get => _taskbarWidthLimit;
+            set => Set(ref _taskbarWidthLimit, value);
         }
 
         private List<string> _quickLaunchOrder = [];