From 7b50820765c87cd4fd7ba51354afca86673bc73f Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 19 Jun 2021 21:04:34 +1000
Subject: [PATCH] add option to switch auto scrollbar hide on/off

---
 .../UserSettings/Settings.cs                         |  2 ++
 Flow.Launcher/Languages/en.xaml                      |  2 ++
 Flow.Launcher/SettingWindow.xaml                     | 11 ++++++++---
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs    | 12 ++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 76a370978..bd847bf28 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -97,6 +97,8 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public bool RememberLastLaunchLocation { get; set; }
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
+        public bool AutoHideScrollBar { get; set; } = false;
+
         public HttpProxy Proxy { get; set; } = new HttpProxy();
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 6232492ba..bf34a842b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -31,6 +31,8 @@
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
     <system:String x:Key="autoUpdates">Auto Update</system:String>
+    <system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar</system:String>
+    <system:String x:Key="autoHideScrollBarToolTip">Automatically hides the setting window's scroll bar, and show when hover the mouse over it</system:String>
     <system:String x:Key="selectPythonDirectory">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 4cb585597..a6a09a1be 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -36,7 +36,7 @@
 
     <TabControl Height="auto" SelectedIndex="0">
         <TabItem Header="{DynamicResource general}">
-            <ScrollViewer ui:ScrollViewerHelper.AutoHideScrollBars="False" Margin="60,30,0,30">
+            <ScrollViewer ui:ScrollViewerHelper.AutoHideScrollBars="{Binding Settings.AutoHideScrollBar}" Margin="60,30,0,30">
                 <StackPanel Orientation="Vertical">
                     <ui:ToggleSwitch Margin="10" IsOn="{Binding PortableMode}">
                         <TextBlock Text="{DynamicResource portableMode}" />
@@ -63,9 +63,14 @@
                     <ui:ToggleSwitch Margin="10" IsOn="{Binding AutoUpdates}">
                         <TextBlock Text="{DynamicResource autoUpdates}" />
                     </ui:ToggleSwitch>
-                    <CheckBox Margin="10" IsChecked="{Binding ShouldUsePinyin}" ToolTip="{DynamicResource ShouldUsePinyinToolTip}">
+                    <CheckBox Margin="10" IsChecked="{Binding ShouldUsePinyin}"
+                              ToolTip="{DynamicResource ShouldUsePinyinToolTip}">
                         <TextBlock Text="{DynamicResource ShouldUsePinyin}" />
                     </CheckBox>
+                    <ui:ToggleSwitch Margin="10" IsOn="{Binding AutoHideScrollBar}"
+                                     ToolTip="{DynamicResource autoHideScrollBarToolTip}">
+                        <TextBlock Text="{DynamicResource autoHideScrollBar}" />
+                    </ui:ToggleSwitch>
                     <StackPanel Margin="10" Orientation="Horizontal">
                         <TextBlock Text="{DynamicResource querySearchPrecision}" FontSize="14" />
                         <ComboBox Margin="10 0 0 0" MaxWidth="200"
@@ -112,7 +117,7 @@
                     </TextBlock>
                     <ListBox SelectedIndex="0" SelectedItem="{Binding SelectedPlugin}"
                              ItemsSource="{Binding PluginViewModels}"
-                             Margin="10, 0, 10, 10" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ui:ScrollViewerHelper.AutoHideScrollBars="True">
+                             Margin="10, 0, 10, 10" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding Settings.AutoHideScrollBar}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Margin="3">
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 2108e2c40..05e170b09 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -61,6 +61,18 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public bool AutoHideScrollBar
+        {
+            get 
+            {
+                return Settings.AutoHideScrollBar;
+            }
+            set
+            {
+                Settings.AutoHideScrollBar = value;
+            }
+        }
+
         // This is only required to set at startup. When portable mode enabled/disabled a restart is always required
         private bool _portableMode = DataLocation.PortableDataLocationInUse();
         public bool PortableMode