From 1915c49146ce9922fb1fb72c1ec4c5c449c20207 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 28 Apr 2024 21:34:52 +0900
Subject: [PATCH] Adjust FontSize

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 1 +
 Flow.Launcher/Resources/SettingWindowStyle.xaml    | 4 ----
 Flow.Launcher/SettingPages/Views/About.xaml        | 1 +
 Flow.Launcher/SettingPages/Views/General.xaml      | 2 +-
 Flow.Launcher/SettingPages/Views/Hotkey.xaml       | 1 +
 Flow.Launcher/SettingPages/Views/PluginStore.xaml  | 1 +
 Flow.Launcher/SettingPages/Views/Plugins.xaml      | 1 +
 Flow.Launcher/SettingPages/Views/Proxy.xaml        | 1 +
 Flow.Launcher/SettingPages/Views/Theme.xaml        | 1 +
 9 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 17a9f1f64..b0e88a045 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -3696,6 +3696,7 @@
         </Setter>
     </Style>
 
+
     <!--  Navigation View  -->
     <system:Double x:Key="NavigationViewCompactPaneLength">48</system:Double>
 
diff --git a/Flow.Launcher/Resources/SettingWindowStyle.xaml b/Flow.Launcher/Resources/SettingWindowStyle.xaml
index 485a0159d..97671b088 100644
--- a/Flow.Launcher/Resources/SettingWindowStyle.xaml
+++ b/Flow.Launcher/Resources/SettingWindowStyle.xaml
@@ -20,10 +20,6 @@
         </CollectionViewSource.GroupDescriptions>
     </CollectionViewSource>
 
-    <Style x:Key="SettingPageBasic" TargetType="{x:Type ui:Page}">
-        <Setter Property="FontSize" Value="14" />
-    </Style>
-
     <Style x:Key="StoreItemFocusVisualStyleKey">
         <Setter Property="Control.Template">
             <Setter.Value>
diff --git a/Flow.Launcher/SettingPages/Views/About.xaml b/Flow.Launcher/SettingPages/Views/About.xaml
index af3c48957..e5d58098c 100644
--- a/Flow.Launcher/SettingPages/Views/About.xaml
+++ b/Flow.Launcher/SettingPages/Views/About.xaml
@@ -21,6 +21,7 @@
     <ScrollViewer
         Margin="0,0,0,0"
         Background="{DynamicResource Color01B}"
+        FontSize="14"
         ScrollViewer.CanContentScroll="True"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
diff --git a/Flow.Launcher/SettingPages/Views/General.xaml b/Flow.Launcher/SettingPages/Views/General.xaml
index 01f30c584..df22a9612 100644
--- a/Flow.Launcher/SettingPages/Views/General.xaml
+++ b/Flow.Launcher/SettingPages/Views/General.xaml
@@ -9,12 +9,12 @@
     Title="General"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    Style="{DynamicResource SettingPageBasic}"
     mc:Ignorable="d">
     <ScrollViewer
         Margin="0,0,0,0"
         Background="{DynamicResource Color01B}"
         CanContentScroll="False"
+        FontSize="14"
         VirtualizingPanel.ScrollUnit="Pixel"
         VirtualizingStackPanel.IsVirtualizing="True">
         <VirtualizingStackPanel Margin="5,18,25,30" Orientation="Vertical">
diff --git a/Flow.Launcher/SettingPages/Views/Hotkey.xaml b/Flow.Launcher/SettingPages/Views/Hotkey.xaml
index b477e77c0..20a69971c 100644
--- a/Flow.Launcher/SettingPages/Views/Hotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/Hotkey.xaml
@@ -23,6 +23,7 @@
     <ScrollViewer
         Margin="0,0,0,0"
         Padding="0,0,6,0"
+        FontSize="14"
         ScrollViewer.CanContentScroll="True"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
diff --git a/Flow.Launcher/SettingPages/Views/PluginStore.xaml b/Flow.Launcher/SettingPages/Views/PluginStore.xaml
index fa71d3375..3a0d3bac1 100644
--- a/Flow.Launcher/SettingPages/Views/PluginStore.xaml
+++ b/Flow.Launcher/SettingPages/Views/PluginStore.xaml
@@ -108,6 +108,7 @@
             Grid.ColumnSpan="2"
             Margin="4,0,0,0"
             Padding="0,0,18,0"
+            FontSize="14"
             ItemContainerStyle="{StaticResource StoreList}"
             ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
diff --git a/Flow.Launcher/SettingPages/Views/Plugins.xaml b/Flow.Launcher/SettingPages/Views/Plugins.xaml
index d0545de11..dc8d3ebdf 100644
--- a/Flow.Launcher/SettingPages/Views/Plugins.xaml
+++ b/Flow.Launcher/SettingPages/Views/Plugins.xaml
@@ -100,6 +100,7 @@
                 Padding="0,0,7,0"
                 HorizontalAlignment="Stretch"
                 Background="{DynamicResource Color01B}"
+                FontSize="14"
                 ItemContainerStyle="{StaticResource PluginList}"
                 ScrollViewer.CanContentScroll="False"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
diff --git a/Flow.Launcher/SettingPages/Views/Proxy.xaml b/Flow.Launcher/SettingPages/Views/Proxy.xaml
index 3e0ecc827..41742a276 100644
--- a/Flow.Launcher/SettingPages/Views/Proxy.xaml
+++ b/Flow.Launcher/SettingPages/Views/Proxy.xaml
@@ -22,6 +22,7 @@
     <ScrollViewer
         Margin="0,0,0,0"
         Padding="5,0,24,0"
+        FontSize="14"
         ScrollViewer.CanContentScroll="True"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
diff --git a/Flow.Launcher/SettingPages/Views/Theme.xaml b/Flow.Launcher/SettingPages/Views/Theme.xaml
index 12708b643..73aca09a0 100644
--- a/Flow.Launcher/SettingPages/Views/Theme.xaml
+++ b/Flow.Launcher/SettingPages/Views/Theme.xaml
@@ -24,6 +24,7 @@
     <ScrollViewer
         Margin="0,0,0,0"
         Padding="6,0,24,0"
+        FontSize="14"
         ScrollViewer.CanContentScroll="True"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">