Merge branch 'dev' into l10n_dev

Author: jjw24

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -220,9 +220,19 @@ public static async Task InitializePluginsAsync()
                 catch (Exception e)
                 {
                     API.LogException(ClassName, $"Fail to Init plugin: {pair.Metadata.Name}", e);
-                    pair.Metadata.Disabled = true;
-                    pair.Metadata.HomeDisabled = true;
-                    failedPlugins.Enqueue(pair);
+                    if (pair.Metadata.Disabled && pair.Metadata.HomeDisabled)
+                    {
+                        // If this plugin is already disabled, do not show error message again
+                        // Or else it will be shown every time
+                        API.LogDebug(ClassName, $"Skipped init for <{pair.Metadata.Name}> due to error");
+                    }
+                    else
+                    {
+                        pair.Metadata.Disabled = true;
+                        pair.Metadata.HomeDisabled = true;
+                        failedPlugins.Enqueue(pair);
+                        API.LogDebug(ClassName, $"Disable plugin <{pair.Metadata.Name}> because init failed");
+                    }
                 }
             }));
 

Flow.Launcher.Infrastructure/Storage/JsonStorage.cs

@@ -45,6 +45,22 @@ public JsonStorage(string filePath)
             FilesFolders.ValidateDirectory(DirectoryPath);
         }
 
+        public bool Exists()
+        {
+            return File.Exists(FilePath);
+        }
+
+        public void Delete()
+        {
+            foreach (var path in new[] { FilePath, BackupFilePath, TempFilePath })
+            {
+                if (File.Exists(path))
+                {
+                    File.Delete(path);
+                }
+            }
+        }
+
         public async Task<T> LoadAsync()
         {
             if (Data != null)

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -293,6 +293,10 @@ public SearchPrecisionScore QuerySearchPrecision
 
         public double WindowLeft { get; set; }
         public double WindowTop { get; set; }
+        public double PreviousScreenWidth { get; set; }
+        public double PreviousScreenHeight { get; set; }
+        public double PreviousDpiX { get; set; }
+        public double PreviousDpiY { get; set; }
 
         /// <summary>
         /// Custom left position on selected monitor

Flow.Launcher/MainWindow.xaml.cs

@@ -22,6 +22,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.ViewModel;
+using Microsoft.Win32;
 using ModernWpf.Controls;
 using DataObject = System.Windows.DataObject;
 using Key = System.Windows.Input.Key;
@@ -88,6 +89,8 @@ public MainWindow()
 
             InitSoundEffects();
             DataObject.AddPastingHandler(QueryTextBox, QueryTextBox_OnPaste);
+            ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged += ThemeManager_ActualApplicationThemeChanged;
+            SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
         }
 
         #endregion
@@ -96,6 +99,11 @@ public MainWindow()
 
 #pragma warning disable VSTHRD100 // Avoid async void methods
 
+        private void ThemeManager_ActualApplicationThemeChanged(ModernWpf.ThemeManager sender, object args)
+        {
+            _theme.RefreshFrameAsync();
+        }
+
         private void OnSourceInitialized(object sender, EventArgs e)
         {
             var handle = Win32Helper.GetWindowHandle(this, true);
@@ -540,16 +548,29 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         #region Window Sound Effects
 
+        private void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
+        {
+            // Fix for sound not playing after sleep / hibernate
+            // https://stackoverflow.com/questions/64805186/mediaplayer-doesnt-play-after-computer-sleeps
+            if (e.Mode == PowerModes.Resume)
+            {
+                InitSoundEffects();
+            }
+        }
+
         private void InitSoundEffects()
         {
             if (_settings.WMPInstalled)
             {
+                animationSoundWMP?.Close();
                 animationSoundWMP = new MediaPlayer();
                 animationSoundWMP.Open(new Uri(AppContext.BaseDirectory + "Resources\\open.wav"));
             }
             else
             {
+                animationSoundWPF?.Dispose();
                 animationSoundWPF = new SoundPlayer(AppContext.BaseDirectory + "Resources\\open.wav");
+                animationSoundWPF.Load();
             }
         }
 
@@ -695,8 +716,26 @@ void InitializePositionInner()
             {
                 if (_settings.SearchWindowScreen == SearchWindowScreens.RememberLastLaunchLocation)
                 {
-                    Top = _settings.WindowTop;
+                    var previousScreenWidth = _settings.PreviousScreenWidth;
+                    var previousScreenHeight = _settings.PreviousScreenHeight;
+                    GetDpi(out var previousDpiX, out var previousDpiY);
+
+                    _settings.PreviousScreenWidth = SystemParameters.VirtualScreenWidth;
+                    _settings.PreviousScreenHeight = SystemParameters.VirtualScreenHeight;
+                    GetDpi(out var currentDpiX, out var currentDpiY);
+
+                    if (previousScreenWidth != 0 && previousScreenHeight != 0 &&
+                        previousDpiX != 0 && previousDpiY != 0 &&
+                        (previousScreenWidth != SystemParameters.VirtualScreenWidth ||
+                         previousScreenHeight != SystemParameters.VirtualScreenHeight ||
+                         previousDpiX != currentDpiX || previousDpiY != currentDpiY))
+                    {
+                        AdjustPositionForResolutionChange();
+                        return;
+                    }
+
                     Left = _settings.WindowLeft;
+                    Top = _settings.WindowTop;
                 }
                 else
                 {
@@ -709,27 +748,73 @@ void InitializePositionInner()
                             break;
                         case SearchWindowAligns.CenterTop:
                             Left = HorizonCenter(screen);
-                            Top = 10;
+                            Top = VerticalTop(screen);
                             break;
                         case SearchWindowAligns.LeftTop:
                             Left = HorizonLeft(screen);
-                            Top = 10;
+                            Top = VerticalTop(screen);
                             break;
                         case SearchWindowAligns.RightTop:
                             Left = HorizonRight(screen);
-                            Top = 10;
+                            Top = VerticalTop(screen);
                             break;
                         case SearchWindowAligns.Custom:
-                            Left = Win32Helper.TransformPixelsToDIP(this,
-                                screen.WorkingArea.X + _settings.CustomWindowLeft, 0).X;
-                            Top = Win32Helper.TransformPixelsToDIP(this, 0,
-                                screen.WorkingArea.Y + _settings.CustomWindowTop).Y;
+                            var customLeft = Win32Helper.TransformPixelsToDIP(this,
+                                screen.WorkingArea.X + _settings.CustomWindowLeft, 0);
+                            var customTop = Win32Helper.TransformPixelsToDIP(this, 0,
+                                screen.WorkingArea.Y + _settings.CustomWindowTop);
+                            Left = customLeft.X;
+                            Top = customTop.Y;
                             break;
                     }
                 }
             }
         }
 
+        private void AdjustPositionForResolutionChange()
+        {
+            var screenWidth = SystemParameters.VirtualScreenWidth;
+            var screenHeight = SystemParameters.VirtualScreenHeight;
+            GetDpi(out var currentDpiX, out var currentDpiY);
+
+            var previousLeft = _settings.WindowLeft;
+            var previousTop = _settings.WindowTop;
+            GetDpi(out var previousDpiX, out var previousDpiY);
+
+            var widthRatio = screenWidth / _settings.PreviousScreenWidth;
+            var heightRatio = screenHeight / _settings.PreviousScreenHeight;
+            var dpiXRatio = currentDpiX / previousDpiX;
+            var dpiYRatio = currentDpiY / previousDpiY;
+
+            var newLeft = previousLeft * widthRatio * dpiXRatio;
+            var newTop = previousTop * heightRatio * dpiYRatio;
+
+            var screenLeft = SystemParameters.VirtualScreenLeft;
+            var screenTop = SystemParameters.VirtualScreenTop;
+
+            var maxX = screenLeft + screenWidth - ActualWidth;
+            var maxY = screenTop + screenHeight - ActualHeight;
+
+            Left = Math.Max(screenLeft, Math.Min(newLeft, maxX));
+            Top = Math.Max(screenTop, Math.Min(newTop, maxY));
+        }
+
+        private void GetDpi(out double dpiX, out double dpiY)
+        {
+            var source = PresentationSource.FromVisual(this);
+            if (source != null && source.CompositionTarget != null)
+            {
+                var matrix = source.CompositionTarget.TransformToDevice;
+                dpiX = 96 * matrix.M11;
+                dpiY = 96 * matrix.M22;
+            }
+            else
+            {
+                dpiX = 96;
+                dpiY = 96;
+            }
+        }
+
         private Screen SelectedScreen()
         {
             Screen screen;
@@ -790,6 +875,13 @@ private double HorizonLeft(Screen screen)
             return left;
         }
 
+        public double VerticalTop(Screen screen)
+        {
+            var dip1 = Win32Helper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y);
+            var top = dip1.Y + 10;
+            return top;
+        }
+
         #endregion
 
         #region Window Animation
@@ -816,7 +908,7 @@ private void InitProgressbarAnimation()
             {
                 Name = progressBarAnimationName, Storyboard = progressBarStoryBoard
             };
-            
+
             var stopStoryboard = new StopStoryboard()
             {
                 BeginStoryboardName = progressBarAnimationName
@@ -837,7 +929,7 @@ private void InitProgressbarAnimation()
             progressStyle.Triggers.Add(trigger);
 
             ProgressBar.Style = progressStyle;
-          
+
             _viewModel.ProgressBarVisibility = Visibility.Hidden;
         }
 
@@ -885,7 +977,7 @@ private void WindowAnimation()
                 Duration = TimeSpan.FromMilliseconds(animationLength),
                 FillBehavior = FillBehavior.HoldEnd
             };
-            
+
             var rightMargin = GetThicknessFromStyle(ClockPanel.Style, new Thickness(0, 0, DefaultRightMargin, 0)).Right;
 
             var thicknessAnimation = new ThicknessAnimation
@@ -913,10 +1005,10 @@ private void WindowAnimation()
             clocksb.Children.Add(ClockOpacity);
             iconsb.Children.Add(IconMotion);
             iconsb.Children.Add(IconOpacity);
-            
+
             _settings.WindowLeft = Left;
             _isArrowKeyPressed = false;
-            
+
             clocksb.Begin(ClockPanel);
             iconsb.Begin(SearchIcon);
         }
@@ -1088,7 +1180,7 @@ private void QueryTextBox_OnPreviewDragOver(object sender, DragEventArgs e)
         {
             e.Handled = true;
         }
-        
+
         #endregion
 
         #region Placeholder
@@ -1140,7 +1232,7 @@ private void SetupResizeMode()
         }
 
         #endregion
-        
+
         #region Search Delay
 
         private void QueryTextBox_TextChanged1(object sender, TextChangedEventArgs e)
@@ -1162,6 +1254,10 @@ protected virtual void Dispose(bool disposing)
                 {
                     _hwndSource?.Dispose();
                     _notifyIcon?.Dispose();
+                    animationSoundWMP?.Close();
+                    animationSoundWPF?.Dispose();
+                    ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged -= ThemeManager_ActualApplicationThemeChanged;
+                    SystemEvents.PowerModeChanged -= SystemEvents_PowerModeChanged;
                 }
 
                 _disposed = true;

Flow.Launcher/PublicAPIInstance.cs

@@ -318,19 +318,37 @@ public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null
         {
             using var explorer = new Process();
             var explorerInfo = _settings.CustomExplorer;
-
-            explorer.StartInfo = new ProcessStartInfo
+            var explorerPath = explorerInfo.Path.Trim().ToLowerInvariant();
+            var targetPath = FileNameOrFilePath is null
+                ? DirectoryPath
+                : Path.IsPathRooted(FileNameOrFilePath)
+                    ? FileNameOrFilePath
+                    : Path.Combine(DirectoryPath, FileNameOrFilePath);
+
+            if (Path.GetFileNameWithoutExtension(explorerPath) == "explorer")
             {
-                FileName = explorerInfo.Path.Replace("%d", DirectoryPath),
-                UseShellExecute = true,
-                Arguments = FileNameOrFilePath is null
-                    ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)
-                    : explorerInfo.FileArgument
-                        .Replace("%d", DirectoryPath)
-                        .Replace("%f",
-                            Path.IsPathRooted(FileNameOrFilePath) ? FileNameOrFilePath : Path.Combine(DirectoryPath, FileNameOrFilePath)
-                        )
-            };
+                // Windows File Manager
+                // We should ignore and pass only the path to Shell to prevent zombie explorer.exe processes
+                explorer.StartInfo = new ProcessStartInfo
+                {
+                    FileName = targetPath,         // Not explorer, Only path.
+                    UseShellExecute = true         // Must be true to open folder
+                };
+            }
+            else
+            {
+                // Custom File Manager
+                explorer.StartInfo = new ProcessStartInfo
+                {
+                    FileName = explorerInfo.Path.Replace("%d", DirectoryPath),
+                    UseShellExecute = true,
+                    Arguments = FileNameOrFilePath is null
+                        ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)
+                        : explorerInfo.FileArgument
+                            .Replace("%d", DirectoryPath)
+                            .Replace("%f", targetPath)
+                };
+            }
             explorer.Start();
         }
 

Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs

@@ -9,20 +9,19 @@ namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage1
     {
-        public Settings Settings { get; private set; }
-        private WelcomeViewModel _viewModel;
+        public Settings Settings { get; } = Ioc.Default.GetRequiredService<Settings>();
+        private readonly WelcomeViewModel _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            _viewModel.PageNum = 1;
+
             if (!IsInitialized)
             {
-                Settings = Ioc.Default.GetRequiredService<Settings>();
-                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
                 InitializeComponent();
             }
-            // Sometimes the navigation is not triggered by button click,
-            // so we need to reset the page number
-            _viewModel.PageNum = 1;
             base.OnNavigatedTo(e);
         }