From 91c9397b0fcff06405482f3b83a0eeac360ec74f Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 7 Sep 2022 14:15:16 +0900
Subject: [PATCH 01/12] - Quick Adjust Width Size by Ctrl + Plus/Minus

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

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index bdf7450525c..0c7d19be0c0 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -124,6 +124,7 @@
     <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="windowWidthSizeToolTip">You can quick adjust Ctrl+Plus/Minus Key in query box too.</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/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 2b7db38cff2..a6dd9ddef6a 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Windows;
@@ -478,6 +478,7 @@ public double WindowTop()
         /// </summary>
         private void OnKeyDown(object sender, KeyEventArgs e)
         {
+            var specialKeyState = GlobalHotkey.CheckModifiers();
             switch (e.Key)
             {
                 case Key.Down:
@@ -504,6 +505,12 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         _viewModel.LoadContextMenuCommand.Execute(null);
                         e.Handled = true;
                     }
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        
+                        _settings.WindowSize = _settings.WindowSize + 100;
+                        Left = Left - 50;
+                    }
                     break;
                 case Key.Left:
                     if (!_viewModel.SelectedIsFromQueryResults() && QueryTextBox.CaretIndex == 0)
@@ -511,9 +518,39 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         _viewModel.EscCommand.Execute(null);
                         e.Handled = true;
                     }
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        if (_settings.WindowSize < 400)
+                        {
+                        }
+                        else
+                        {
+                            _settings.WindowSize = _settings.WindowSize - 100;
+                            Left = Left + 50;
+                        }
+                    }
+                    break;
+                case Key.OemMinus:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        if (_settings.WindowSize < 400)
+                        {
+                        }
+                        else
+                        {
+                            _settings.WindowSize = _settings.WindowSize - 100;
+                            Left = Left + 50;
+                        }
+                    }
+                    break;
+                case Key.OemPlus:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        _settings.WindowSize = _settings.WindowSize + 100;
+                        Left = Left - 50;
+                    }
                     break;
                 case Key.Back:
-                    var specialKeyState = GlobalHotkey.CheckModifiers();
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_viewModel.SelectedIsFromQueryResults()
@@ -531,6 +568,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
+
                 default:
                     break;
 
@@ -556,4 +594,4 @@ public void InitializeColorScheme()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ba6569771d1..cbb25247d73 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1604,6 +1604,7 @@
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
                                                 <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource windowWidthSizeToolTip}" />
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal">
                                                 <TextBlock
@@ -1617,6 +1618,7 @@
                                                     Name="WindowWidthValue"
                                                     Width="300"
                                                     Margin="0,0,18,0"
+                                                    VerticalAlignment="Center"
                                                     IsMoveToPointEnabled="True"
                                                     IsSnapToTickEnabled="True"
                                                     Maximum="1920"

From 2ca2fe9d9e5f112fb4ecf60f9c1735277c91957e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 7 Sep 2022 14:45:07 +0900
Subject: [PATCH 02/12] - Add Quick adjust maxresultcount by CTRL+[ and  ]

---
 Flow.Launcher/Languages/en.xaml  |  1 +
 Flow.Launcher/MainWindow.xaml.cs | 18 ++++++++++++++++++
 Flow.Launcher/SettingWindow.xaml | 12 +++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 0c7d19be0c0..6e3dd3a0e65 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -41,6 +41,7 @@
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
+    <system:String x:Key="maxShowResultsToolTip">You can quick adjust CTRL+[ and CTRL+] in query box.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a full screen application is active (Recommended for games).</system:String>
     <system:String x:Key="defaultFileManager">Default File Manager</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index a6dd9ddef6a..6837d60ed39 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -550,6 +550,24 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         Left = Left - 50;
                     }
                     break;
+                case Key.OemOpenBrackets:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        if (_settings.MaxResultsToShow < 2)
+                        {
+                        }
+                        else
+                        {
+                            _settings.MaxResultsToShow = _settings.MaxResultsToShow - 1;
+                        }
+                    }
+                    break;
+                case Key.OemCloseBrackets:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        _settings.MaxResultsToShow = _settings.MaxResultsToShow + 1;
+                    }
+                    break;
                 case Key.Back:
                     if (specialKeyState.CtrlPressed)
                     {
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index cbb25247d73..5d62e627c31 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -768,11 +768,13 @@
                                         BorderThickness="0"
                                         Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Style="{DynamicResource SettingTitleLabel}"
-                                                Text="{DynamicResource maxShowResults}" />
+                                            <StackPanel Grid.Column="1">
+                                                <TextBlock
+                                                    VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
+                                                    Text="{DynamicResource maxShowResults}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource maxShowResultsToolTip}" />
+                                            </StackPanel>
                                             <ComboBox
                                                 Grid.Column="2"
                                                 Width="100"

From 16400ab7fffdb92f5b7614a8caf8c3fd8fccda6e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 8 Sep 2022 16:44:00 +0900
Subject: [PATCH 03/12] - Add Ctrl+F12 to Toggle Game mode

---
 Flow.Launcher/MainWindow.xaml.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 6837d60ed39..3366e78028b 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -568,6 +568,12 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         _settings.MaxResultsToShow = _settings.MaxResultsToShow + 1;
                     }
                     break;
+                case Key.F12:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        ToggleGameMode();
+                    }
+                    break;
                 case Key.Back:
                     if (specialKeyState.CtrlPressed)
                     {
@@ -586,7 +592,6 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-
                 default:
                     break;
 

From 9cfb92b6f34b61dd12789c46bb41c0445da0c909 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 8 Sep 2022 18:09:21 +0900
Subject: [PATCH 04/12] Change Shortcut each other (+-,[])

---
 Flow.Launcher/Languages/en.xaml  | 4 ++--
 Flow.Launcher/MainWindow.xaml.cs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 6e3dd3a0e65..47041cdf096 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -41,7 +41,7 @@
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
-    <system:String x:Key="maxShowResultsToolTip">You can quick adjust CTRL+[ and CTRL+] in query box.</system:String>
+    <system:String x:Key="maxShowResultsToolTip">You can quick adjust CTRL+Plus and CTRL+Minus in query box.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a full screen application is active (Recommended for games).</system:String>
     <system:String x:Key="defaultFileManager">Default File Manager</system:String>
@@ -125,7 +125,7 @@
     <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="windowWidthSizeToolTip">You can quick adjust Ctrl+Plus/Minus Key in query box too.</system:String>
+    <system:String x:Key="windowWidthSizeToolTip">You can quick adjust Ctrl+[, Ctrl+] in query box too.</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/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 3366e78028b..7c859b5507e 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -530,7 +530,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemMinus:
+                case Key.OemCloseBrackets:
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_settings.WindowSize < 400)
@@ -543,14 +543,14 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemPlus:
+                case Key.OemOpenBrackets:
                     if (specialKeyState.CtrlPressed)
                     {
                         _settings.WindowSize = _settings.WindowSize + 100;
                         Left = Left - 50;
                     }
                     break;
-                case Key.OemOpenBrackets:
+                case Key.OemPlus:
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_settings.MaxResultsToShow < 2)
@@ -562,7 +562,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemCloseBrackets:
+                case Key.OemMinus:
                     if (specialKeyState.CtrlPressed)
                     {
                         _settings.MaxResultsToShow = _settings.MaxResultsToShow + 1;

From e67e4fd99e4fc8f9b388ec958be7136da37d16ba Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 14 Sep 2022 11:01:28 +0900
Subject: [PATCH 05/12] Adjust Keys assign

---
 Flow.Launcher/MainWindow.xaml.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 7c859b5507e..b3262b7fd42 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -530,7 +530,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemCloseBrackets:
+                case Key.OemOpenBrackets:
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_settings.WindowSize < 400)
@@ -543,14 +543,14 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemOpenBrackets:
+                case Key.OemCloseBrackets:
                     if (specialKeyState.CtrlPressed)
                     {
                         _settings.WindowSize = _settings.WindowSize + 100;
                         Left = Left - 50;
                     }
                     break;
-                case Key.OemPlus:
+                case Key.OemMinus:
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_settings.MaxResultsToShow < 2)
@@ -562,7 +562,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
-                case Key.OemMinus:
+                case Key.OemPlus:
                     if (specialKeyState.CtrlPressed)
                     {
                         _settings.MaxResultsToShow = _settings.MaxResultsToShow + 1;

From 01c9be37bf795ad7087c6b649ee3b53c3529a4f1 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Mon, 19 Sep 2022 15:32:17 -0500
Subject: [PATCH 06/12] Use Command in ViewModel to control data change (Add
 MVVM Toolkit to generate RelayCommand)

---
 Flow.Launcher/Flow.Launcher.csproj       |  1 +
 Flow.Launcher/MainWindow.xaml            | 20 +++++-
 Flow.Launcher/MainWindow.xaml.cs         | 80 +++-------------------
 Flow.Launcher/ViewModel/MainViewModel.cs | 87 ++++++++++++++++++------
 4 files changed, 98 insertions(+), 90 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 66cc911ee87..0db1915c50f 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -83,6 +83,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
     <PackageReference Include="Fody" Version="6.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 714fcc53fa1..7730c5658f6 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -32,7 +32,9 @@
     Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
     WindowStartupLocation="Manual"
     WindowStyle="None"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Left="{Binding Left, Mode=TwoWay}"
+    Top="{Binding Top, Mode=TwoWay}">
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
@@ -84,6 +86,22 @@
             Modifiers="Ctrl" />
         <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
         <KeyBinding Key="Left" Command="{Binding EscCommand}" />
+        <KeyBinding
+            Key="OemCloseBrackets"
+            Modifiers="Control"
+            Command="{Binding IncreaseWidthCommand}"/>
+        <KeyBinding
+            Key="OemOpenBrackets"
+            Modifiers="Control"
+            Command="{Binding DecreaseWidthCommand}"/>
+        <KeyBinding
+            Key="OemPlus"
+            Modifiers="Control"
+            Command="{Binding IncreaseMaxResultCommand}"/> 
+        <KeyBinding
+            Key="OemMinus"
+            Modifiers="Control"
+            Command="{Binding DecreaseMaxResultCommand}"/>
         <KeyBinding
             Key="H"
             Command="{Binding LoadHistoryCommand}"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b3262b7fd42..ddb1c23312b 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -44,7 +44,6 @@ public MainWindow(Settings settings, MainViewModel mainVM)
             _viewModel = mainVM;
             _settings = settings;
             InitializeComponent();
-            InitializePosition();
             animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
         }
 
@@ -89,6 +88,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
             InitializeColorScheme();
             WindowsInteropHelper.DisableControlBox(this);
             InitProgressbarAnimation();
+            InitializePosition();
             // since the default main window visibility is visible
             // so we need set focus during startup
             QueryTextBox.Focus();
@@ -180,20 +180,6 @@ private void OnLoaded(object sender, RoutedEventArgs _)
             };
         }
 
-        private void InitializePosition()
-        {
-            if (_settings.RememberLastLaunchLocation)
-            {
-                Top = _settings.WindowTop;
-                Left = _settings.WindowLeft;
-            }
-            else
-            {
-                Left = WindowLeft();
-                Top = WindowTop();
-            }
-        }
-
         private void UpdateNotifyIconText()
         {
             var menu = contextMenu;
@@ -454,6 +440,15 @@ public void HideStartup()
             }
         }
 
+        private void InitializePosition()
+        {
+            if (!_settings.RememberLastLaunchLocation)
+            {
+                Left = WindowLeft();
+                Top = WindowTop();
+            }
+        }
+        
         public double WindowLeft()
         {
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
@@ -505,12 +500,6 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         _viewModel.LoadContextMenuCommand.Execute(null);
                         e.Handled = true;
                     }
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        
-                        _settings.WindowSize = _settings.WindowSize + 100;
-                        Left = Left - 50;
-                    }
                     break;
                 case Key.Left:
                     if (!_viewModel.SelectedIsFromQueryResults() && QueryTextBox.CaretIndex == 0)
@@ -518,55 +507,6 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         _viewModel.EscCommand.Execute(null);
                         e.Handled = true;
                     }
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        if (_settings.WindowSize < 400)
-                        {
-                        }
-                        else
-                        {
-                            _settings.WindowSize = _settings.WindowSize - 100;
-                            Left = Left + 50;
-                        }
-                    }
-                    break;
-                case Key.OemOpenBrackets:
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        if (_settings.WindowSize < 400)
-                        {
-                        }
-                        else
-                        {
-                            _settings.WindowSize = _settings.WindowSize - 100;
-                            Left = Left + 50;
-                        }
-                    }
-                    break;
-                case Key.OemCloseBrackets:
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        _settings.WindowSize = _settings.WindowSize + 100;
-                        Left = Left - 50;
-                    }
-                    break;
-                case Key.OemMinus:
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        if (_settings.MaxResultsToShow < 2)
-                        {
-                        }
-                        else
-                        {
-                            _settings.MaxResultsToShow = _settings.MaxResultsToShow - 1;
-                        }
-                    }
-                    break;
-                case Key.OemPlus:
-                    if (specialKeyState.CtrlPressed)
-                    {
-                        _settings.MaxResultsToShow = _settings.MaxResultsToShow + 1;
-                    }
                     break;
                 case Key.F12:
                     if (specialKeyState.CtrlPressed)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index e6289926104..e61b8404645 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -21,10 +21,11 @@
 using ISavable = Flow.Launcher.Plugin.ISavable;
 using System.IO;
 using System.Collections.Specialized;
+using CommunityToolkit.Mvvm.Input;
 
 namespace Flow.Launcher.ViewModel
 {
-    public class MainViewModel : BaseModel, ISavable
+    public partial class MainViewModel : BaseModel, ISavable
     {
         #region Private Fields
 
@@ -61,13 +62,6 @@ public MainViewModel(Settings settings)
             _lastQuery = new Query();
 
             _settings = settings;
-            _settings.PropertyChanged += (_, args) =>
-            {
-                if (args.PropertyName == nameof(Settings.WindowSize))
-                {
-                    OnPropertyChanged(nameof(MainWindowWidth));
-                }
-            };
 
             _historyItemsStorage = new FlowLauncherJsonStorage<History>();
             _userSelectedRecordStorage = new FlowLauncherJsonStorage<UserSelectedRecord>();
@@ -82,6 +76,7 @@ public MainViewModel(Settings settings)
             _selectedResults = Results;
 
             InitializeKeyCommands();
+
             RegisterViewUpdate();
             RegisterResultsUpdatedEvent();
 
@@ -154,6 +149,8 @@ private void RegisterResultsUpdatedEvent()
             }
         }
 
+
+
         private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
@@ -307,7 +304,7 @@ private void InitializeKeyCommands()
                             Notification.Show(
                                 InternationalizationManager.Instance.GetTranslation("success"),
                                 InternationalizationManager.Instance.GetTranslation("completedSuccessfully")
-                                );
+                            );
                         }), TaskScheduler.Default)
                     .ConfigureAwait(false);
             });
@@ -318,9 +315,9 @@ private void InitializeKeyCommands()
         #region ViewModel Properties
 
         public ResultsViewModel Results { get; private set; }
-        
+
         public ResultsViewModel ContextMenu { get; private set; }
-        
+
         public ResultsViewModel History { get; private set; }
 
         public bool GameModeStatus { get; set; }
@@ -336,6 +333,54 @@ public string QueryText
             }
         }
 
+
+        public double Top
+        {
+            get => _settings.WindowTop;
+            set
+            {
+                _settings.WindowTop = value;
+                OnPropertyChanged();
+            }
+        }
+        public double Left
+        {
+            get => _settings.WindowLeft;
+            set
+            {
+                _settings.WindowLeft = value;
+                OnPropertyChanged();
+            }
+        }
+
+        [RelayCommand]
+        private void IncreaseWidth()
+        {
+            MainWindowWidth += 100;
+            Left -= 50;
+        }
+
+        [RelayCommand]
+        private void DecreaseWidth()
+        {
+            if (MainWindowWidth < 400) return;
+            Left += 50;
+            MainWindowWidth -= 100;
+        }
+
+        [RelayCommand]
+        private void IncreaseMaxResult()
+        {
+            _settings.MaxResultsToShow += 1;
+        }
+
+        [RelayCommand]
+        private void DecreaseMaxResult()
+        {
+            if (_settings.MaxResultsToShow < 2) return;
+            _settings.MaxResultsToShow -= 1;
+        }
+
         /// <summary>
         /// we need move cursor to end when we manually changed query
         /// but we don't want to move cursor to end when query is updated from TextBox
@@ -411,7 +456,11 @@ private ResultsViewModel SelectedResults
 
         public Visibility SearchIconVisibility { get; set; }
 
-        public double MainWindowWidth => _settings.WindowSize;
+        public double MainWindowWidth
+        {
+            get => _settings.WindowSize;
+            set => _settings.WindowSize = value;
+        }
 
         public string PluginIconPath { get; set; } = null;
 
@@ -592,7 +641,7 @@ private async void QueryResults()
                 PluginIconPath = null;
                 SearchIconVisibility = Visibility.Visible;
             }
-            
+
 
             if (query.ActionKeyword == Plugin.Query.GlobalPluginWildcardSign)
             {
@@ -903,18 +952,18 @@ public void ResultCopy(string stringToCopy)
 
                         Clipboard.SetFileDropList(paths);
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy") 
-                                +" " 
-                                + (isFile? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")), 
+                            App.API.GetTranslation("copy")
+                            + " "
+                            + (isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")),
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                     else
                     {
                         Clipboard.SetDataObject(copyText.ToString());
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy") 
-                                + " " 
-                                + App.API.GetTranslation("textTitle"), 
+                            App.API.GetTranslation("copy")
+                            + " "
+                            + App.API.GetTranslation("textTitle"),
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                 }

From 0baf04eb74558cf1422e25d99cd806f771609df3 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Tue, 27 Sep 2022 11:47:39 -0500
Subject: [PATCH 07/12] Merge branch 'dev' into QuickSizeAdjust & Work around
 dotnet/wpf#6792

---
 Flow.Launcher.Plugin/Result.cs                | 11 +++
 Flow.Launcher/Flow.Launcher.csproj            | 10 +++
 Flow.Launcher/ReportWindow.xaml.cs            |  1 -
 Flow.Launcher/ResultListBox.xaml              |  6 +-
 Flow.Launcher/Themes/Base.xaml                | 15 ++++
 .../Search/ResultManager.cs                   | 88 ++++++++++++++++++-
 .../Search/SearchManager.cs                   |  9 +-
 .../Search/WindowsIndex/IndexSearch.cs        |  6 +-
 global.json                                   |  4 +-
 9 files changed, 141 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 35c491d35f8..13639546709 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -197,5 +197,16 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
         {
             return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false);
         }
+
+        /// <summary>
+        /// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result
+        /// </summary>
+        public int? ProgressBar { get; set; }
+
+        /// <summary>
+        /// Optionally set the color of the progress bar
+        /// </summary>
+        /// <default>#26a0da (blue)</default>
+        public string ProgressBarColor { get; set; } = "#26a0da";
     }
 }
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 0db1915c50f..813a44527be 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -115,4 +115,14 @@
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
   </Target>
+
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+    <!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
+
+    <ItemGroup>
+      <FilteredAnalyzer Include="@(Analyzer->Distinct())" />
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs
index 72c69d74d17..4899edc1463 100644
--- a/Flow.Launcher/ReportWindow.xaml.cs
+++ b/Flow.Launcher/ReportWindow.xaml.cs
@@ -77,7 +77,6 @@ private Paragraph Hyperlink(string textBeforeUrl, string url)
             };
             link.Inlines.Add(url);
             link.NavigateUri = new Uri(url);
-            link.RequestNavigate += (s, e) => SearchWeb.OpenInBrowserTab(e.Uri.ToString());
             link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);
 
             paragraph.Inlines.Add(textBeforeUrl);
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index f7e82005008..2c78f9babbf 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -111,7 +111,11 @@
                                 <RowDefinition />
                                 <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
-
+                            <ProgressBar
+                                x:Name="progressbarResult"
+                                Foreground="{Binding Result.ProgressBarColor}"
+                                Style="{DynamicResource ProgressBarResult}"
+                                Value="{Binding Result.ProgressBar}" />
                             <TextBlock
                                 x:Name="Title"
                                 VerticalAlignment="Center"
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 087606d0436..dbd5b31c109 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -81,6 +81,21 @@
 
 
     <!--  Item Style  -->
+    <Style x:Key="ProgressBarResult" TargetType="{x:Type ProgressBar}">
+        <Setter Property="Height" Value="18" />
+        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="Minimum" Value="0" />
+        <Setter Property="Visibility" Value="Visible" />
+        <Setter Property="Foreground" Value="#26a0da " />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 63310bebd3a..2b8b010c01f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -77,6 +77,92 @@ internal static Result CreateFolderResult(string title, string subtitle, string
             };
         }
 
+        internal static Result CreateDriveSpaceDisplayResult(string path, bool windowsIndexed = false)
+        {
+            var progressBarColor = "#26a0da";
+            int? progressValue = null;
+            var title = string.Empty; // hide title when use progress bar,
+            var driveLetter = path.Substring(0, 1).ToUpper();
+            var driveName = driveLetter + ":\\";
+            DriveInfo drv = new DriveInfo(driveLetter);
+            var subtitle = toReadableSize(drv.AvailableFreeSpace, 2) + " free of " + toReadableSize(drv.TotalSize, 2);
+            double UsingSize = (Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100;
+
+            progressValue = Convert.ToInt32(UsingSize);
+
+            if (progressValue >= 90)
+                progressBarColor = "#da2626";
+
+            return new Result
+            {
+                Title = title,
+                SubTitle = subtitle,
+                AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
+                IcoPath = path,
+                Score = 500,
+                ProgressBar = progressValue,
+                ProgressBarColor = progressBarColor,
+                Action = c =>
+                {
+                    Context.API.OpenDirectory(path);
+                    return true;
+                },
+                TitleToolTip = path,
+                SubTitleToolTip = path,
+                ContextData = new SearchResult
+                {
+                    Type = ResultType.Folder,
+                    FullPath = path,
+                    ShowIndexState = true,
+                    WindowsIndexed = windowsIndexed
+                }
+            };
+        }
+
+        private static string toReadableSize(long pDrvSize, int pi)
+        {
+            int mok = 0;
+            double drvSize = pDrvSize;
+            string Space = "Byte";
+
+            while (drvSize > 1024.0)
+            {
+                drvSize /= 1024.0;
+                mok++;
+            }
+
+            if (mok == 1)
+                Space = "KB";
+            else if (mok == 2)
+                Space = " MB";
+            else if (mok == 3)
+                Space = " GB";
+            else if (mok == 4)
+                Space = " TB";
+
+            var returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+            if (mok != 0)
+            {
+                switch (pi)
+                {
+                    case 1:
+                        returnStr = string.Format("{0:F1}{1}", drvSize, Space);
+                        break;
+                    case 2:
+                        returnStr = string.Format("{0:F2}{1}", drvSize, Space);
+                        break;
+                    case 3:
+                        returnStr = string.Format("{0:F3}{1}", drvSize, Space);
+                        break;
+                    default:
+                        returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+                        break;
+                }
+            }
+
+            return returnStr;
+        }
+
         internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIndexed = false)
         {
             var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path);
@@ -208,4 +294,4 @@ public enum ResultType
         Folder,
         File
     }
-}
\ No newline at end of file
+}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 2b56cdf6ea5..4bddbda5770 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -123,7 +123,14 @@ public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken t
 
             var useIndexSearch = UseWindowsIndexForDirectorySearch(locationPath);
 
-            results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, useIndexSearch));
+            if (locationPath.EndsWith(":\\"))
+            {
+                results.Add(ResultManager.CreateDriveSpaceDisplayResult(locationPath, useIndexSearch));
+            }
+            else
+            {
+                results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, useIndexSearch));
+            }
 
             token.ThrowIfCancellationRequested();
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
index 2e842c84354..318a9bde958 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 using Microsoft.Search.Interop;
 using System;
@@ -17,7 +17,7 @@ internal static class IndexSearch
     {
 
         // Reserved keywords in oleDB
-        private const string reservedStringPattern = @"^[`\@\#\^,\&\/\\\$\%_;\[\]]+$";
+        private const string reservedStringPattern = @"^[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+$";
 
         internal static async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string indexQueryString, string connectionString, Query query, CancellationToken token)
         {
@@ -29,7 +29,7 @@ internal static async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i
                 await using var conn = new OleDbConnection(connectionString);
                 await conn.OpenAsync(token);
                 token.ThrowIfCancellationRequested();
-
+                
                 await using var command = new OleDbCommand(indexQueryString, conn);
                 // Results return as an OleDbDataReader.
                 await using var dataReaderResults = await command.ExecuteReaderAsync(token) as OleDbDataReader;
diff --git a/global.json b/global.json
index 5e94f4b05ba..6ff5b35d3d8 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.100",
-        "rollForward": "latestFeature"
+        "version": "6.0.*",
+        "rollForward": "latestPatch"
     }
 }
\ No newline at end of file

From 644c56026ad6b1bd92250db946ae36978c8a77b1 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 10 Oct 2022 15:33:33 +0900
Subject: [PATCH 08/12] - Add MaxWidth Limit - Size reflect to Slider

---
 Flow.Launcher/ViewModel/MainViewModel.cs        | 17 ++++++++++++++---
 .../ViewModel/SettingWindowViewModel.cs         |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index e61b8404645..0f2749acf4c 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -62,6 +62,13 @@ public MainViewModel(Settings settings)
             _lastQuery = new Query();
 
             _settings = settings;
+            _settings.PropertyChanged += (_, args) =>
+            {
+                if (args.PropertyName == nameof(Settings.WindowSize))
+                {
+                    OnPropertyChanged(nameof(MainWindowWidth));
+                }
+            };
 
             _historyItemsStorage = new FlowLauncherJsonStorage<History>();
             _userSelectedRecordStorage = new FlowLauncherJsonStorage<UserSelectedRecord>();
@@ -356,21 +363,25 @@ public double Left
         [RelayCommand]
         private void IncreaseWidth()
         {
-            MainWindowWidth += 100;
+            if (_settings.WindowSize > 1920) return;
+            _settings.WindowSize += 100;
             Left -= 50;
+            OnPropertyChanged();
         }
 
         [RelayCommand]
         private void DecreaseWidth()
         {
-            if (MainWindowWidth < 400) return;
+            if (_settings.WindowSize < 400) return;
             Left += 50;
-            MainWindowWidth -= 100;
+            _settings.WindowSize -= 100;
+            OnPropertyChanged();
         }
 
         [RelayCommand]
         private void IncreaseMaxResult()
         {
+            if (_settings.MaxResultsToShow > 17) return;
             _settings.MaxResultsToShow += 1;
         }
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 64cb9e36cbe..49a184e21e0 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -41,6 +41,9 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
                     case nameof(Settings.ActivateTimes):
                         OnPropertyChanged(nameof(ActivatedTimes));
                         break;
+                    case nameof(Settings.WindowSize):
+                        OnPropertyChanged(nameof(WindowWidthSize));
+                        break;
                 }
             };
         }

From 83262dea78894b4b3c317f8a2aa5e06e6ab05c2b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 10 Oct 2022 15:37:13 +0900
Subject: [PATCH 09/12] Fix MaxResultCount

---
 Flow.Launcher/ViewModel/MainViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 0f2749acf4c..0cc3ed82563 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -381,7 +381,7 @@ private void DecreaseWidth()
         [RelayCommand]
         private void IncreaseMaxResult()
         {
-            if (_settings.MaxResultsToShow > 17) return;
+            if (_settings.MaxResultsToShow > 16) return;
             _settings.MaxResultsToShow += 1;
         }
 

From 833857d940686f606e114b117a61097a9a6185a2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 13 Oct 2022 13:57:42 +0900
Subject: [PATCH 10/12] Fix Max/Min Logic

---
 Flow.Launcher/ViewModel/MainViewModel.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 0cc3ed82563..8be81d29b1a 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -363,18 +363,30 @@ public double Left
         [RelayCommand]
         private void IncreaseWidth()
         {
-            if (_settings.WindowSize > 1920) return;
-            _settings.WindowSize += 100;
-            Left -= 50;
+            if (MainWindowWidth + 100 > 1920 || _settings.WindowSize == 1920)
+            {
+               _settings.WindowSize = 1920;        
+            }
+            else 
+            { 
+                _settings.WindowSize += 100;
+                Left -= 50;
+            }
             OnPropertyChanged();
         }
 
         [RelayCommand]
         private void DecreaseWidth()
         {
-            if (_settings.WindowSize < 400) return;
-            Left += 50;
-            _settings.WindowSize -= 100;
+            if (MainWindowWidth - 100 < 400 || _settings.WindowSize == 400)
+            {
+                _settings.WindowSize = 400;
+            }
+            else
+            { 
+                Left += 50;
+                _settings.WindowSize -= 100;
+            }
             OnPropertyChanged();
         }
 

From eef6878d9208e34f2a906389bc1871bc17e96aaf Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 14 Oct 2022 20:46:53 +1100
Subject: [PATCH 11/12] fix minimum results to show

---
 Flow.Launcher/ViewModel/MainViewModel.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 8be81d29b1a..2f07f43dba9 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -393,14 +393,18 @@ private void DecreaseWidth()
         [RelayCommand]
         private void IncreaseMaxResult()
         {
-            if (_settings.MaxResultsToShow > 16) return;
+            if (_settings.MaxResultsToShow == 17)
+                return;
+
             _settings.MaxResultsToShow += 1;
         }
 
         [RelayCommand]
         private void DecreaseMaxResult()
         {
-            if (_settings.MaxResultsToShow < 2) return;
+            if (_settings.MaxResultsToShow == 2)
+                return;
+
             _settings.MaxResultsToShow -= 1;
         }
 

From 6592de9b5ab26e1435f8c1ee8dbbef2ba69d1548 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 14 Oct 2022 21:06:33 +1100
Subject: [PATCH 12/12] update wording

---
 Flow.Launcher/Languages/en.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 95b2241c748..824201f7d66 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -41,7 +41,7 @@
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
-    <system:String x:Key="maxShowResultsToolTip">You can quick adjust CTRL+Plus and CTRL+Minus in query box.</system:String>
+    <system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a full screen application is active (Recommended for games).</system:String>
     <system:String x:Key="defaultFileManager">Default File Manager</system:String>
@@ -132,7 +132,7 @@
     <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="windowWidthSizeToolTip">You can quick adjust Ctrl+[, Ctrl+] in query box too.</system:String>
+    <system:String x:Key="windowWidthSizeToolTip">You can also quickly adjust this by using Ctrl+[ and Ctrl+].</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>