Fix Conflicts

Author: onesounds

Flow.Launcher/MainWindow.xaml

@@ -80,7 +80,10 @@
             Command="{Binding LoadContextMenuCommand}" />
         <KeyBinding Key="Left"
             Command="{Binding EscCommand}" />
-        <KeyBinding Key="H"
+        <KeyBinding
+            Key="H"
+            Command="{Binding LoadHistoryCommand}"
+            Modifiers="Ctrl" />
         <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
         <KeyBinding Key="Left" Command="{Binding EscCommand}" />
         <KeyBinding

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -360,49 +360,49 @@ public string QueryText
         [RelayCommand]
         private void IncreaseWidth()
         {
-            if (MainWindowWidth + 100 > 1920 || _settings.WindowSize == 1920)
+            if (MainWindowWidth + 100 > 1920 || Settings.WindowSize == 1920)
             {
-               _settings.WindowSize = 1920;        
+                Settings.WindowSize = 1920;        
             }
             else 
-            { 
-                _settings.WindowSize += 100;
-                _settings.WindowLeft -= 50;
+            {
+                Settings.WindowSize += 100;
+                Settings.WindowLeft -= 50;
             }
             OnPropertyChanged();
         }
 
         [RelayCommand]
         private void DecreaseWidth()
         {
-            if (MainWindowWidth - 100 < 400 || _settings.WindowSize == 400)
+            if (MainWindowWidth - 100 < 400 || Settings.WindowSize == 400)
             {
-                _settings.WindowSize = 400;
+                Settings.WindowSize = 400;
             }
             else
-            { 
-                _settings.WindowLeft += 50;
-                _settings.WindowSize -= 100;
+            {
+                Settings.WindowLeft += 50;
+                Settings.WindowSize -= 100;
             }
             OnPropertyChanged();
         }
 
         [RelayCommand]
         private void IncreaseMaxResult()
         {
-            if (_settings.MaxResultsToShow == 17)
+            if (Settings.MaxResultsToShow == 17)
                 return;
 
-            _settings.MaxResultsToShow += 1;
+            Settings.MaxResultsToShow += 1;
         }
 
         [RelayCommand]
         private void DecreaseMaxResult()
         {
-            if (_settings.MaxResultsToShow == 2)
+            if (Settings.MaxResultsToShow == 2)
                 return;
 
-            _settings.MaxResultsToShow -= 1;
+            Settings.MaxResultsToShow -= 1;
         }
 
         /// <summary>
@@ -482,8 +482,8 @@ private ResultsViewModel SelectedResults
 
         public double MainWindowWidth
         {
-            get => _settings.WindowSize;
-            set => _settings.WindowSize = value;
+            get => Settings.WindowSize;
+            set => Settings.WindowSize = value;
         }
 
         public string PluginIconPath { get; set; } = null;