From 4092ef83ea9207eda52529f6e7efe099a029eb76 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 20 Mar 2023 20:31:49 +0800
Subject: [PATCH 1/2] Formatting

---
 Flow.Launcher/MainWindow.xaml.cs              |  2 -
 Flow.Launcher/SettingWindow.xaml              | 42 +++++++++----------
 .../ViewModel/SettingWindowViewModel.cs       |  1 -
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 4477da5f4..96b114dac 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -17,7 +17,6 @@ using DragEventArgs = System.Windows.DragEventArgs;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using NotifyIcon = System.Windows.Forms.NotifyIcon;
 using Flow.Launcher.Infrastructure;
-using System.Windows.Media;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Plugin.SharedCommands;
 using System.Windows.Threading;
@@ -25,7 +24,6 @@ using System.Windows.Data;
 using ModernWpf.Controls;
 using Key = System.Windows.Input.Key;
 using System.Media;
-using System.Linq;
 
 namespace Flow.Launcher
 {
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index a3b76ffe6..d79f2cbce 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -778,15 +778,15 @@
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal">
                                                 <ComboBox
-                                                        x:Name="SearchWindowPosition"
-                                                        MinWidth="160"
-                                                        Margin="0,0,18,0"
-                                                        VerticalAlignment="Center"
-                                                        DisplayMemberPath="Display"
-                                                        FontSize="14"
-                                                        ItemsSource="{Binding SearchWindowAligns}"
-                                                        SelectedValue="{Binding Settings.SearchWindowAlign}"
-                                                        SelectedValuePath="Value">
+                                                    x:Name="SearchWindowPosition"
+                                                    MinWidth="160"
+                                                    Margin="0,0,18,0"
+                                                    VerticalAlignment="Center"
+                                                    DisplayMemberPath="Display"
+                                                    FontSize="14"
+                                                    ItemsSource="{Binding SearchWindowAligns}"
+                                                    SelectedValue="{Binding Settings.SearchWindowAlign}"
+                                                    SelectedValuePath="Value">
                                                 </ComboBox>
                                                 <StackPanel Margin="0,0,18,0" Orientation="Horizontal">
                                                     <StackPanel.Style>
@@ -800,20 +800,20 @@
                                                         </Style>
                                                     </StackPanel.Style>
                                                     <TextBox
-                                                            Height="35"
-                                                            MinWidth="120"
-                                                            Text="{Binding Settings.CustomWindowLeft}"
-                                                            TextWrapping="NoWrap" />
+                                                        Height="35"
+                                                        MinWidth="120"
+                                                        Text="{Binding Settings.CustomWindowLeft}"
+                                                        TextWrapping="NoWrap" />
                                                     <TextBlock
-                                                            Margin="10"
-                                                            VerticalAlignment="Center"
-                                                            Foreground="{DynamicResource Color05B}"
-                                                            Text="x" />
+                                                        Margin="10"
+                                                        VerticalAlignment="Center"
+                                                        Foreground="{DynamicResource Color05B}"
+                                                        Text="x" />
                                                     <TextBox
-                                                            Height="35"
-                                                            MinWidth="120"
-                                                            Text="{Binding Settings.CustomWindowTop}"
-                                                            TextWrapping="NoWrap" />
+                                                        Height="35"
+                                                        MinWidth="120"
+                                                        Text="{Binding Settings.CustomWindowTop}"
+                                                        TextWrapping="NoWrap" />
                                                 </StackPanel>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index f704b8200..9bdf2db4d 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -22,7 +22,6 @@ using Flow.Launcher.Plugin.SharedModels;
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.Input;
 using System.Globalization;
-using static Flow.Launcher.ViewModel.SettingWindowViewModel;
 
 namespace Flow.Launcher.ViewModel
 {

From 78a74b99047449c4798ef22f9f208ecf04205d22 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 20 Mar 2023 20:41:53 +0800
Subject: [PATCH 2/2] Tweak style and add localization

---
 Flow.Launcher/Languages/en.xaml  | 1 +
 Flow.Launcher/SettingWindow.xaml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index f18553903..ad1c002e6 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -43,6 +43,7 @@
     <system:String x:Key="SearchWindowScreenFocus">Monitor with Focused Window</system:String>
     <system:String x:Key="SearchWindowScreenPrimary">Primary Monitor</system:String>
     <system:String x:Key="SearchWindowScreenCustom">Custom Monitor</system:String>
+    <system:String x:Key="SearchWindowAlign">Search Window Position on Monitor</system:String>
     <system:String x:Key="SearchWindowAlignCenter">Center</system:String>
     <system:String x:Key="SearchWindowAlignCenterTop">Center Top</system:String>
     <system:String x:Key="SearchWindowAlignLeftTop">Left Top</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d79f2cbce..665d16b8f 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -774,7 +774,7 @@
 
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Search Window position on selected screen" />
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowAlign}" />
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal">
                                                 <ComboBox
@@ -801,7 +801,7 @@
                                                     </StackPanel.Style>
                                                     <TextBox
                                                         Height="35"
-                                                        MinWidth="120"
+                                                        MinWidth="80"
                                                         Text="{Binding Settings.CustomWindowLeft}"
                                                         TextWrapping="NoWrap" />
                                                     <TextBlock
@@ -811,7 +811,7 @@
                                                         Text="x" />
                                                     <TextBox
                                                         Height="35"
-                                                        MinWidth="120"
+                                                        MinWidth="80"
                                                         Text="{Binding Settings.CustomWindowTop}"
                                                         TextWrapping="NoWrap" />
                                                 </StackPanel>