Merge pull request #2775 from onesounds/240613-AddTypeIconForTheme

Change IsDark Type Icon in Theme List
Flow-Launcher · Jun 15, 2024 · 3f3612a · 3f3612a
2 parents 78daf0b + 7ceadec
commit 3f3612a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -180,6 +180,8 @@
     <system:String x:Key="AnimationSpeedCustom">Custom</system:String>
     <system:String x:Key="Clock">Clock</system:String>
     <system:String x:Key="Date">Date</system:String>
+    <system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
+    <system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
 
 
     <!--  Setting Hotkey  -->

diff --git a/Flow.Launcher/Resources/SettingWindowStyle.xaml b/Flow.Launcher/Resources/SettingWindowStyle.xaml
@@ -8,6 +8,8 @@
     <converters:TextConverter x:Key="TextConverter" />
     <core:TranslationConverter x:Key="TranslationConverter" />
 
+    <!--  Icon for Theme Type Label  -->
+    <Geometry x:Key="circle_half_stroke_solid">F1 M512,512z M0,0z M448,256C448,150,362,64,256,64L256,448C362,448,448,362,448,256z M0,256A256,256,0,1,1,512,256A256,256,0,1,1,0,256z</Geometry>
     <Style x:Key="StoreItemFocusVisualStyleKey">
         <Setter Property="Control.Template">
             <Setter.Value>

diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -390,17 +390,21 @@
                 Icon="&#xe790;">
                 <cc:ExCard.SideContent>
                     <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
-                        <ui:FontIcon
-                            Margin="0 2 8 0"
+                        <ui:PathIcon
+                            Width="12"
+                            Margin="0 1 8 0"
                             VerticalAlignment="Center"
-                            FontSize="12"
-                            Glyph="&#xED66;"
+                            Data="{DynamicResource circle_half_stroke_solid}"
+                            ToolTip="{DynamicResource TypeIsDarkToolTip}"
+                            ToolTipService.InitialShowDelay="0"
                             Visibility="{Binding SelectedTheme.IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
                         <ui:FontIcon
                             Margin="0 2 8 0"
                             VerticalAlignment="Center"
                             FontSize="12"
                             Glyph="&#xEB42;"
+                            ToolTip="{DynamicResource TypeHasBlurToolTip}"
+                            ToolTipService.InitialShowDelay="0"
                             Visibility="{Binding SelectedTheme.HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
                         <TextBlock Text="{Binding SelectedTheme.Name}" />
                     </StackPanel>
@@ -433,17 +437,21 @@
                                         VerticalAlignment="Center"
                                         Text="{Binding Name}"
                                         TextWrapping="Wrap" />
-                                    <ui:FontIcon
+                                    <ui:PathIcon
+                                        Width="12"
                                         Margin="8 1 0 0"
                                         VerticalAlignment="Center"
-                                        FontSize="12"
-                                        Glyph="&#xED66;"
+                                        Data="{DynamicResource circle_half_stroke_solid}"
+                                        ToolTip="{DynamicResource TypeIsDarkToolTip}"
+                                        ToolTipService.InitialShowDelay="0"
                                         Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     <ui:FontIcon
                                         Margin="8 1 0 0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Glyph="&#xEB42;"
+                                        ToolTip="{DynamicResource TypeHasBlurToolTip}"
+                                        ToolTipService.InitialShowDelay="0"
                                         Visibility="{Binding HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
                                 </StackPanel>
                             </Grid>