From 00a4d62b2220b37838338c5f06e4e6bb0859f9d1 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 25 Nov 2022 22:03:17 +0900
Subject: [PATCH] - Temp Fix Confict / Change F2 to F1

---
 Flow.Launcher/Languages/en.xaml            | 2 +-
 Flow.Launcher/MainWindow.xaml.cs           | 2 +-
 Flow.Launcher/ViewModel/ResultViewModel.cs | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 2b47935ab..73f7158d6 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -67,7 +67,7 @@
     <system:String x:Key="ShouldUsePinyin">Search with Pinyin</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.</system:String>
     <system:String x:Key="AlwaysPreview">Always open preview when start search</system:String>
-    <system:String x:Key="AlwaysPreviewToolTip">If uncheck, preview not showing when start launch. Please use F2 key
+    <system:String x:Key="AlwaysPreviewToolTip">If uncheck, preview not showing when start launch. Please use F1 key</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
     <!--  Setting Plugin  -->
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 623b4f3c7..4db2ade69 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -619,7 +619,7 @@ namespace Flow.Launcher
                         }
                     }
                     break;
-                case Key.F2:
+                case Key.F1:
                     PreviewToggle();
                     e.Handled = true;
                     break;
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index 37b838251..25a48204d 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -202,8 +202,10 @@ namespace Flow.Launcher.ViewModel
         private async ValueTask LoadPreviewImageAsync()
         {
             var imagePath = Result.PreviewImage ?? Result.IcoPath;
+            var loadFullImage = (Path.GetExtension(imagePath) ?? "").Equals(".url", StringComparison.OrdinalIgnoreCase);
             // We need to modify the property not field here to trigger the OnPropertyChanged event
-            PreviewImage = await Task.Run(() => ImageLoader.Load(imagePath, true)).ConfigureAwait(false);
+            //PreviewImage = await Task.Run(() => ImageLoader.Load(imagePath, true)).ConfigureAwait(false);
+            PreviewImage = await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
         }
 
         public Result Result { get; }