Merge pull request #1996 from VictoriousRaptor/Amend1978

Amend 1978

Author: VictoriousRaptor

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>

Flow.Launcher/MainWindow.xaml.cs

@@ -17,15 +17,13 @@
 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;
 using System.Windows.Data;
 using ModernWpf.Controls;
 using Key = System.Windows.Input.Key;
 using System.Media;
-using System.Linq;
 
 namespace Flow.Launcher
 {

Flow.Launcher/SettingWindow.xaml

@@ -774,19 +774,19 @@
 
                                         <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
-                                                        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="80"
+                                                        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="80"
+                                                        Text="{Binding Settings.CustomWindowTop}"
+                                                        TextWrapping="NoWrap" />
                                                 </StackPanel>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -22,7 +22,6 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.Input;
 using System.Globalization;
-using static Flow.Launcher.ViewModel.SettingWindowViewModel;
 
 namespace Flow.Launcher.ViewModel
 {