From 20b0db3f30a1a89f83b40634647d9759d24c4fc3 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 2 Jun 2024 22:42:40 +0900
Subject: [PATCH] - Change BlurAmount to Bool - Adjust Theme List layout

---
 Flow.Launcher.Core/Resource/Theme.cs          |  8 ++---
 .../SettingPages/Views/SettingsPaneTheme.xaml | 33 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 1c7485a9c..a442eae64 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -262,12 +262,12 @@ namespace Flow.Launcher.Core.Resource
                         )
                     };
                 }
-                else if (line.StartsWith("BlurAmount:", StringComparison.OrdinalIgnoreCase))
+                else if (line.StartsWith("IsBlur:", StringComparison.OrdinalIgnoreCase))
                 {
                     themeData = themeData with
                     {
-                        BlurAmount = int.Parse(
-                            line.Remove(0, "BlurAmount:".Length).Trim()
+                        IsBlur = bool.Parse(
+                            line.Remove(0, "IsBlur:".Length).Trim()
                         )
                     };
                 }
@@ -452,6 +452,6 @@ namespace Flow.Launcher.Core.Resource
         }
         #endregion
 
-        public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, int? BlurAmount = null);
+        public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? IsBlur = null);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 0c89ea195..99916491a 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -467,16 +467,29 @@
                                 Width="Auto"
                                 Height="34"
                                 Margin="0">
-                                <TextBlock
-                                    x:Name="ThemeName"
-                                    Margin="0"
-                                    Padding="14 12"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Focusable="True"
-                                    FontSize="12"
-                                    Text="{Binding Name}"
-                                    TextWrapping="Wrap" />
+                                <StackPanel Margin="12 0" Orientation="Horizontal">
+                                    <TextBlock
+                                        x:Name="ThemeName"
+                                        Margin="0 0 0 0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="12"
+                                        Text="{Binding Name}"
+                                        TextWrapping="Wrap" />
+
+                                    <ui:FontIcon
+                                        Margin="8 0 0 0"
+                                        VerticalAlignment="Center"
+                                        FontSize="12"
+                                        Glyph="&#xED66;"
+                                        Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    <ui:FontIcon
+                                        Margin="8 0 0 0"
+                                        VerticalAlignment="Center"
+                                        FontSize="8"
+                                        Glyph="&#xEB42;"
+                                        Visibility="{Binding IsBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                </StackPanel>
                             </Grid>
                         </DataTemplate>
                     </ListBox.ItemTemplate>