Merge branch 'dev' into net7.0

Author: taooceros

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -41,25 +41,26 @@ body:
   - type: input
     attributes:
       label: Flow Launcher Version
-      description: Go to "Settings" => "About".
-      value: v1.8.3
+      description: Go to "Settings" => "About". If you are using a prerelease version please append the build number.
+      placeholder: "Example: 1.11.0"
+    validations:
+      required: true
 
   - type: input
     attributes:
       label: Windows Build Number
-      description: Run "ver" at CMD (command prompt).
-      value: 10.0.19043.1288
+      description: Run "ver" at CMD (command prompt) or go to Windows Settings -> Systems -> About.
+      placeholder: "Example: 10.0.19043.1288"
+    validations:
+      required: true
+
 
   - type: textarea
     id: logs
     attributes:
       label: Error Log
       description: >
-        Log file place:
-
-        - The latest version place: `%AppData%\FlowLauncher\Logs\<version>\<date>.txt`
-
-        - For portable mode: `%LocalAppData%\FlowLauncher\<App-Version>\UserData\Logs\<version>\<date>.txt`
+        From flow type 'open log location' and find log file with the corresponding date containing the error info.
       value: >
         <details>
 

Flow.Launcher.Infrastructure/FileExplorerHelper.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Flow.Launcher.Infrastructure
+{
+    public static class FileExplorerHelper
+    {
+        /// <summary>
+        /// Gets the path of the file explorer that is currently in the foreground
+        /// </summary>
+        public static string GetActiveExplorerPath()
+        {
+            var explorerWindow = GetActiveExplorer();
+            string locationUrl = explorerWindow?.LocationURL;
+            return !string.IsNullOrEmpty(locationUrl) ? new Uri(locationUrl).LocalPath + "\\" : null;
+        }
+
+        /// <summary>
+        /// Gets the file explorer that is currently in the foreground
+        /// </summary>
+        private static dynamic GetActiveExplorer()
+        {
+            Type type = Type.GetTypeFromProgID("Shell.Application");
+            if (type == null) return null;
+            dynamic shell = Activator.CreateInstance(type);
+            if (shell == null)
+            {
+                return null;
+            }
+
+            var explorerWindows = new List<dynamic>();
+            var openWindows = shell.Windows();
+            for (int i = 0; i < openWindows.Count; i++)
+            {
+                var window = openWindows.Item(i);
+                if (window == null) continue;
+
+                // find the desired window and make sure that it is indeed a file explorer
+                // we don't want the Internet Explorer or the classic control panel
+                // ToLower() is needed, because Windows can report the path as "C:\\Windows\\Explorer.EXE"
+                if (Path.GetFileName((string)window.FullName)?.ToLower() == "explorer.exe")
+                {
+                    explorerWindows.Add(window);
+                }
+            }
+
+            if (explorerWindows.Count == 0) return null;
+
+            var zOrders = GetZOrder(explorerWindows);
+
+            return explorerWindows.Zip(zOrders).MinBy(x => x.Second).First;
+        }
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+        private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+        /// <summary>
+        /// Gets the z-order for one or more windows atomically with respect to each other. In Windows, smaller z-order is higher. If the window is not top level, the z order is returned as -1. 
+        /// </summary>
+        private static IEnumerable<int> GetZOrder(List<dynamic> hWnds)
+        {
+            var z = new int[hWnds.Count];
+            for (var i = 0; i < hWnds.Count; i++) z[i] = -1;
+
+            var index = 0;
+            var numRemaining = hWnds.Count;
+            EnumWindows((wnd, _) =>
+            {
+                var searchIndex = hWnds.FindIndex(x => x.HWND == wnd.ToInt32());
+                if (searchIndex != -1)
+                {
+                    z[searchIndex] = index;
+                    numRemaining--;
+                    if (numRemaining == 0) return false;
+                }
+                index++;
+                return true;
+            }, IntPtr.Zero);
+
+            return z;
+        }
+    }
+}

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -192,8 +192,10 @@ public string QuerySearchPrecisionString
         public ObservableCollection<CustomShortcutModel> CustomShortcuts { get; set; } = new ObservableCollection<CustomShortcutModel>();
 
         [JsonIgnore]
-        public ObservableCollection<BuiltinShortcutModel> BuiltinShortcuts { get; set; } = new ObservableCollection<BuiltinShortcutModel>() { 
-            new BuiltinShortcutModel("{clipboard}", "shortcut_clipboard_description", Clipboard.GetText)
+        public ObservableCollection<BuiltinShortcutModel> BuiltinShortcuts { get; set; } = new()
+        {
+            new BuiltinShortcutModel("{clipboard}", "shortcut_clipboard_description", Clipboard.GetText), 
+            new BuiltinShortcutModel("{active_explorer_path}", "shortcut_active_explorer_path", FileExplorerHelper.GetActiveExplorerPath)
         };
 
         public bool DontPromptUpdateMsg { get; set; }

Flow.Launcher/Languages/en.xaml

@@ -176,6 +176,7 @@
     <system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
     <system:String x:Key="deleteCustomShortcutWarning">Are you sure you want to delete shortcut: {0} with expansion {1}?</system:String>
     <system:String x:Key="shortcut_clipboard_description">Get text from clipboard.</system:String>
+    <system:String x:Key="shortcut_active_explorer_path">Get path from active explorer.</system:String>
     <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>

Flow.Launcher/ViewModel/ResultViewModel.cs

@@ -188,7 +188,7 @@ private async Task<ImageSource> LoadImageInternalAsync(string imagePath, Result.
             {
                 try
                 {
-                    var image = await Task.Run(() => icon()).ConfigureAwait(false);
+                    var image = icon();
                     return image;
                 }
                 catch (Exception e)