Merge branch 'dev' into rename-file

Author: Jack251970

Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs

@@ -449,9 +449,19 @@ public bool ChangeTheme(string theme = null)
                 }
                 return false;
             }
-            catch (XamlParseException)
+            catch (XamlParseException e)
             {
-                _api.LogError(ClassName, $"Theme <{theme}> fail to parse");
+                _api.LogException(ClassName, $"Theme <{theme}> fail to parse xaml", e);
+                if (theme != Constant.DefaultTheme)
+                {
+                    _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));
+                    ChangeTheme(Constant.DefaultTheme);
+                }
+                return false;
+            }
+            catch (Exception e)
+            {
+                _api.LogException(ClassName, $"Theme <{theme}> fail to load", e);
                 if (theme != Constant.DefaultTheme)
                 {
                     _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));

Flow.Launcher.Core/Resource/Theme.cs

@@ -85,5 +85,10 @@ QueryFullProcessImageName
 EVENT_OBJECT_HIDE
 EVENT_SYSTEM_DIALOGEND
 
+DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS
 WM_POWERBROADCAST
-PBT_APMRESUMEAUTOMATIC
+PBT_APMRESUMEAUTOMATIC
+PBT_APMRESUMESUSPEND
+PowerRegisterSuspendResumeNotification
+PowerUnregisterSuspendResumeNotification
+DeviceNotifyCallbackRoutine

Flow.Launcher.Infrastructure/NativeMethods.txt

@@ -19,6 +19,7 @@
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.System.Power;
 using Windows.Win32.System.Threading;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.Shell.Common;
@@ -338,9 +339,6 @@ public static Point TransformPixelsToDIP(Visual visual, double unitX, double uni
         public const int SC_MAXIMIZE = (int)PInvoke.SC_MAXIMIZE;
         public const int SC_MINIMIZE = (int)PInvoke.SC_MINIMIZE;
 
-        public const int WM_POWERBROADCAST = (int)PInvoke.WM_POWERBROADCAST;
-        public const int PBT_APMRESUMEAUTOMATIC = (int)PInvoke.PBT_APMRESUMEAUTOMATIC;
-
         #endregion
 
         #region Window Handle
@@ -918,5 +916,105 @@ public static string SelectFile()
         }
 
         #endregion
+
+        #region Sleep Mode Listener
+
+        private static Action _func;
+        private static PDEVICE_NOTIFY_CALLBACK_ROUTINE _callback = null;
+        private static DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS _recipient;
+        private static SafeHandle _recipientHandle;
+        private static HPOWERNOTIFY _handle = HPOWERNOTIFY.Null;
+
+        /// <summary>
+        /// Registers a listener for sleep mode events.
+        /// Inspired from: https://github.com/XKaguya/LenovoLegionToolkit
+        /// https://blog.csdn.net/mochounv/article/details/114668594
+        /// </summary>
+        /// <param name="func"></param>
+        /// <exception cref="Win32Exception"></exception>
+        public static unsafe void RegisterSleepModeListener(Action func)
+        {
+            if (_callback != null)
+            {
+                // Only register if not already registered
+                return;
+            }
+
+            _func = func;
+            _callback = new PDEVICE_NOTIFY_CALLBACK_ROUTINE(DeviceNotifyCallback);
+            _recipient = new DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS()
+            {
+                Callback = _callback,
+                Context = null
+            };
+
+            _recipientHandle = new StructSafeHandle<DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS>(_recipient);
+            _handle = PInvoke.PowerRegisterSuspendResumeNotification(
+                REGISTER_NOTIFICATION_FLAGS.DEVICE_NOTIFY_CALLBACK,
+                _recipientHandle,
+                out var handle) == WIN32_ERROR.ERROR_SUCCESS ?
+                new HPOWERNOTIFY(new IntPtr(handle)) :
+                HPOWERNOTIFY.Null;
+            if (_handle.IsNull)
+            {
+                throw new Win32Exception("Error registering for power notifications: " + Marshal.GetLastWin32Error());
+            }
+        }
+
+        /// <summary>
+        /// Unregisters the sleep mode listener.
+        /// </summary>
+        public static void UnregisterSleepModeListener()
+        {
+            if (!_handle.IsNull)
+            {
+                PInvoke.PowerUnregisterSuspendResumeNotification(_handle);
+                _handle = HPOWERNOTIFY.Null;
+                _func = null;
+                _callback = null;
+                _recipientHandle = null;
+            }
+        }
+
+        private static unsafe uint DeviceNotifyCallback(void* context, uint type, void* setting)
+        {
+            switch (type)
+            {
+                case PInvoke.PBT_APMRESUMEAUTOMATIC:
+                    // Operation is resuming automatically from a low-power state.This message is sent every time the system resumes
+                    _func?.Invoke();
+                    break;
+
+                case PInvoke.PBT_APMRESUMESUSPEND:
+                    // Operation is resuming from a low-power state.This message is sent after PBT_APMRESUMEAUTOMATIC if the resume is triggered by user input, such as pressing a key
+                    _func?.Invoke();
+                    break;
+            }
+
+            return 0;
+        }
+
+        private sealed class StructSafeHandle<T> : SafeHandle where T : struct
+        {
+            private readonly nint _ptr = nint.Zero;
+
+            public StructSafeHandle(T recipient) : base(nint.Zero, true)
+            {
+                var pRecipient = Marshal.AllocHGlobal(Marshal.SizeOf<T>());
+                Marshal.StructureToPtr(recipient, pRecipient, false);
+                SetHandle(pRecipient);
+                _ptr = pRecipient;
+            }
+
+            public override bool IsInvalid => handle == nint.Zero;
+
+            protected override bool ReleaseHandle()
+            {
+                Marshal.FreeHGlobal(_ptr);
+                return true;
+            }
+        }
+
+        #endregion
     }
 }

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -2,25 +2,26 @@
     x:Class="Flow.Launcher.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     ShutdownMode="OnMainWindowClose"
     Startup="OnStartup">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources>
                     <ui:ThemeResources.ThemeDictionaries>
-                        <ResourceDictionary x:Key="Light">
+                        <ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
                             <ResourceDictionary.MergedDictionaries>
                                 <ResourceDictionary Source="pack://application:,,,/Resources/Light.xaml" />
                             </ResourceDictionary.MergedDictionaries>
                         </ResourceDictionary>
-                        <ResourceDictionary x:Key="Dark">
+                        <ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
                             <ResourceDictionary.MergedDictionaries>
                                 <ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
                             </ResourceDictionary.MergedDictionaries>
                         </ResourceDictionary>
-                        <ResourceDictionary x:Key="HighContrast">
+                        <ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
                             <ResourceDictionary.MergedDictionaries>
                                 <ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
                             </ResourceDictionary.MergedDictionaries>
@@ -33,6 +34,15 @@
                 <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <!--  Override styles in UI.Modern.WPF  -->
+            <Thickness x:Key="ListViewItemCompactSelectedBorderThemeThickness">2</Thickness>
+            <sys:Double x:Key="CheckBoxMinWidth">0</sys:Double>
+            <sys:Double x:Key="GridViewItemMinWidth">0</sys:Double>
+            <sys:Double x:Key="GridViewItemMinHeight">40</sys:Double>
+            <sys:Double x:Key="ListViewItemMinWidth">0</sys:Double>
+            <sys:Double x:Key="ListViewItemMinHeight">36</sys:Double>
+            <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="#FF0063B1" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>

Flow.Launcher/App.xaml

@@ -22,6 +22,7 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
+using iNKORE.UI.WPF.Modern.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.VisualStudio.Threading;
@@ -56,6 +57,9 @@ public partial class App : IDisposable, ISingleInstanceApp
 
         public App()
         {
+            // Do not use bitmap cache since it can cause WPF second window freezing issue
+            ShadowAssist.UseBitmapCache = false;
+
             // Initialize settings
             _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
 

Flow.Launcher/App.xaml.cs

@@ -5,7 +5,7 @@
 
 namespace Flow.Launcher.Converters;
 
-internal class BoolToIMEConversionModeConverter : IValueConverter
+public class BoolToIMEConversionModeConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
@@ -22,7 +22,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
     }
 }
 
-internal class BoolToIMEStateConverter : IValueConverter
+public class BoolToIMEStateConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {

Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters;
+
+public class CornerRadiusFilterConverter : DependencyObject, IValueConverter
+{
+    public CornerRadiusFilterKind Filter { get; set; }
+
+    public double Scale { get; set; } = 1.0;
+
+    public static CornerRadius Convert(CornerRadius radius, CornerRadiusFilterKind filterKind)
+    {
+        CornerRadius result = radius;
+
+        switch (filterKind)
+        {
+            case CornerRadiusFilterKind.Top:
+                result.BottomLeft = 0;
+                result.BottomRight = 0;
+                break;
+            case CornerRadiusFilterKind.Right:
+                result.TopLeft = 0;
+                result.BottomLeft = 0;
+                break;
+            case CornerRadiusFilterKind.Bottom:
+                result.TopLeft = 0;
+                result.TopRight = 0;
+                break;
+            case CornerRadiusFilterKind.Left:
+                result.TopRight = 0;
+                result.BottomRight = 0;
+                break;
+        }
+
+        return result;
+    }
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        var cornerRadius = (CornerRadius)value;
+
+        var scale = Scale;
+        if (!double.IsNaN(scale))
+        {
+            cornerRadius.TopLeft *= scale;
+            cornerRadius.TopRight *= scale;
+            cornerRadius.BottomRight *= scale;
+            cornerRadius.BottomLeft *= scale;
+        }
+
+        var filterType = Filter;
+        if (filterType == CornerRadiusFilterKind.TopLeftValue ||
+            filterType == CornerRadiusFilterKind.BottomRightValue)
+        {
+            return GetDoubleValue(cornerRadius, filterType);
+        }
+
+        return Convert(cornerRadius, filterType);
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+
+    private static double GetDoubleValue(CornerRadius radius, CornerRadiusFilterKind filterKind)
+    {
+        switch (filterKind)
+        {
+            case CornerRadiusFilterKind.TopLeftValue:
+                return radius.TopLeft;
+            case CornerRadiusFilterKind.BottomRightValue:
+                return radius.BottomRight;
+        }
+        return 0;
+    }
+}
+
+public enum CornerRadiusFilterKind
+{
+    None,
+    Top,
+    Right,
+    Bottom,
+    Left,
+    TopLeftValue,
+    BottomRightValue
+}

Flow.Launcher/Converters/CornerRadiusFilterConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters;
+
+public class PlacementRectangleConverter : IMultiValueConverter
+{
+    public Thickness Margin { get; set; }
+
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (values.Length == 2 &&
+            values[0] is double width &&
+            values[1] is double height)
+        {
+            var margin = Margin;
+            var topLeft = new Point(margin.Left, margin.Top);
+            var bottomRight = new Point(width - margin.Right, height - margin.Bottom);
+            var rect = new Rect(topLeft, bottomRight);
+            return rect;
+        }
+
+        return Rect.Empty;
+    }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}