remove auto hiding of setting window's scrollbar

jjw24 · jjw24 · commit 1a5116023e14 · 2021-10-26T06:41:25.000+11:00
related 925f6bc, a452feb
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -99,8 +99,6 @@ public bool HideNotifyIcon
         public bool RememberLastLaunchLocation { get; set; }
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
-        public bool AutoHideScrollBar { get; set; }
-
         public HttpProxy Proxy { get; set; } = new HttpProxy();
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -35,7 +35,6 @@
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a Full screen application is active (Recommended for games).</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 in Setting</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/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
@@ -35,7 +35,6 @@
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
     <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
     <system:String x:Key="autoUpdates">자동 업데이트</system:String>
-    <system:String x:Key="autoHideScrollBar">설정 창 스크롤바 숨기기</system:String>
     <system:String x:Key="selectPythonDirectory">선택</system:String>
     <system:String x:Key="hideOnStartup">시작 시 Flow Launcher 숨김</system:String>
     <system:String x:Key="hideNotifyIcon">트레이 아이콘 숨기기</system:String>
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
@@ -31,8 +31,6 @@
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignorovať klávesové skratky v režime na celú obrazovku</system:String>
     <system:String x:Key="pythonDirectory">Priečinok s Pythonom</system:String>
     <system:String x:Key="autoUpdates">Automatická aktualizácia</system:String>
-    <system:String x:Key="autoHideScrollBar">Automaticky skryť posuvník</system:String>
-    <system:String x:Key="autoHideScrollBarToolTip">Automaticky skrývať posuvník v okne nastavení a zobraziť ho, keď naň prejdete myšou</system:String>
     <system:String x:Key="selectPythonDirectory">Vybrať</system:String>
     <system:String x:Key="hideOnStartup">Schovať Flow Launcher po spustení</system:String>
     <system:String x:Key="hideNotifyIcon">Schovať ikonu z oblasti oznámení</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -401,7 +401,6 @@
             </TabItem.Header>
 
             <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
                           Margin="0,0,0,0" Background="#f3f3f3">
                 <StackPanel Orientation="Vertical" Margin="5,18,25,30">
                     <TextBlock Text="{DynamicResource general}" Grid.Row="2" TextAlignment="left" FontSize="30"
@@ -649,7 +648,7 @@
                              ItemsSource="{Binding PluginViewModels}"
                              Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource PluginList}"
-                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True"  ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}">
+                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel Margin="0,0,0,18"/>
@@ -902,7 +901,7 @@
                              ItemsSource="{Binding ExternalPlugins}"
                              Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource StoreList}" SelectionMode="Single"
-                             Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch"  ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}">
+                             Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" SnapsToDevicePixels="True"/>
@@ -1038,7 +1037,6 @@
             </TabItem.Header>
             <Border Padding=" 0 0 0 0 ">
                 <ScrollViewer ScrollViewer.CanContentScroll="False"
-                              ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
                               Margin="0,0,0,0" Background="#f3f3f3" Padding="6 0 24 0">
                     <Grid Margin="0 0 0 0" Background="#f3f3f3">
                         <Grid.RowDefinitions>
@@ -1314,7 +1312,6 @@
                 </Grid>
             </TabItem.Header>
             <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
                           Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 6 0">
                 <Border Background="#f3f3f3">
                     <Grid Margin="5 18 18 10">
@@ -1442,7 +1439,6 @@
                 </Grid>
             </TabItem.Header>
             <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
                           Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 24 0">
                 <Border Background="#f3f3f3">
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -63,12 +63,6 @@ public bool AutoUpdates
             }
         }
 
-        public bool AutoHideScrollBar
-        {
-            get => 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

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,6 @@ public bool AutoUpdates`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- public bool AutoHideScrollBar`
`67`		`- {`
`68`		`- get => Settings.AutoHideScrollBar;`
`69`		`- set => Settings.AutoHideScrollBar = value;`
`70`		`- }`
`71`		`-`
`72`	`66`	`// This is only required to set at startup. When portable mode enabled/disabled a restart is always required`
`73`	`67`	`private bool _portableMode = DataLocation.PortableDataLocationInUse();`
`74`	`68`	`public bool PortableMode`