From 6b37adaf0797a407696032cfa3692caac8bca22f Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 21 Oct 2021 18:31:14 +0900
Subject: [PATCH] - Remove Comment - Add String "Window Width Size"

---
 Flow.Launcher.Core/Resource/Theme.cs               | 14 +-------------
 .../UserSettings/Settings.cs                       |  2 +-
 Flow.Launcher/Languages/en.xaml                    |  1 +
 Flow.Launcher/SettingWindow.xaml                   |  6 ++----
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs  |  6 +++++-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index d934491be..efd311acb 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -189,20 +189,8 @@ namespace Flow.Launcher.Core.Resource
                     new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
-
+            /* Ignore Theme Window Width and use setting */
             var windowStyle = dict["WindowStyle"] as Style;
-            /*
-            var width = windowStyle?.Setters.OfType<Setter>().Where(x => x.Property.Name == "Width")
-                .Select(x => x.Value).FirstOrDefault();
-
-            if (width == null)
-            {
-                windowStyle = dict["BaseWindowStyle"] as Style;
-
-                width = windowStyle?.Setters.OfType<Setter>().Where(x => x.Property.Name == "Width")
-                .Select(x => x.Value).FirstOrDefault();
-            }
-            */
             var width = Settings.WindowSize;
             windowStyle.Setters.Add(new Setter(Window.WidthProperty, width));
             mainWindowWidth = (double)width;
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 3bae6a24c..1d4100138 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-
+using Flow.Launcher;
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class Settings : BaseModel
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4a9b92700..bbb56b9ec 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -82,6 +82,7 @@
     <system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
     <system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
     <system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU. Not recommended if your computer performance is limited.</system:String>
+    <system:String x:Key="windowWidthSize">Window Width Size</system:String>
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 403e6adaf..8e20232ac 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -677,13 +677,11 @@
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Text="Window Width Size" Style="{DynamicResource SettingTitleLabel}"/>
+                                        <TextBlock Text="{DynamicResource windowWidthSize}" Style="{DynamicResource SettingTitleLabel}"/>
                                     </StackPanel>
-                                    <!--<Button DockPanel.Dock="Top" Margin="0,0,18,0" Width="180" HorizontalAlignment="Center" 
-                            Click="OpenPluginFolder" Grid.Column="2">Open Theme Folder</Button>-->
                                     <StackPanel Orientation="Horizontal" Grid.Column="2">
                                         <TextBlock Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextAlignment="Right" Width="100" Margin="0 0 8 2"/>
-                                        <Slider Name="WindowWidthValue" Value="{Binding Settings.WindowSize, Mode=TwoWay}" Maximum="900" Minimum="400" Margin="0,0,18,0" TickFrequency="10" IsSnapToTickEnabled="True" Width="400"/>
+                                        <Slider Name="WindowWidthValue" Value="{Binding WindowWidthSize, Mode=TwoWay}" Maximum="900" Minimum="400" Margin="0,0,18,0" TickFrequency="10" IsSnapToTickEnabled="True" Width="300"/>
                                     </StackPanel>
                                     <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
                                 &#xe740;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index b5fc2d803..67d167113 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -307,7 +307,11 @@ namespace Flow.Launcher.ViewModel
         public double WindowWidthSize
         {
             get { return Settings.WindowSize; }
-            set { Settings.WindowSize = value;}
+            set 
+            { 
+                Settings.WindowSize = value; 
+                ThemeManager.Instance.ChangeTheme(Settings.Theme); 
+            }
         }
 
         public bool UseGlyphIcons