From cd6140dcb452821593045153d1cd8ae1461873bd Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 25 Oct 2022 21:45:06 +0900
Subject: [PATCH] Fix Conflicts

---
 Flow.Launcher/MainWindow.xaml            |  5 +++-
 Flow.Launcher/ViewModel/MainViewModel.cs | 32 ++++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index bb5c28b0a..6f3915076 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/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
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index fd5ad242f..fc23fecd0 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -360,14 +360,14 @@ namespace Flow.Launcher.ViewModel
         [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();
         }
@@ -375,14 +375,14 @@ namespace Flow.Launcher.ViewModel
         [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();
         }
@@ -390,19 +390,19 @@ namespace Flow.Launcher.ViewModel
         [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 @@ namespace Flow.Launcher.ViewModel
 
         public double MainWindowWidth
         {
-            get => _settings.WindowSize;
-            set => _settings.WindowSize = value;
+            get => Settings.WindowSize;
+            set => Settings.WindowSize = value;
         }
 
         public string PluginIconPath { get; set; } = null;