enhance: bring window into view after receive IPC message

Signed-off-by: leo <[email protected]>

Author: love-linger

src/App.axaml.cs

@@ -510,19 +510,30 @@ private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
 
         private void TryOpenRepository(string repo)
         {
-            if (string.IsNullOrEmpty(repo) || !Directory.Exists(repo))
-                return;
-
-            var test = new Commands.QueryRepositoryRootPath(repo).ReadToEnd();
-            if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
+            if (!string.IsNullOrEmpty(repo) && Directory.Exists(repo))
             {
-                Dispatcher.UIThread.Invoke(() =>
+                var test = new Commands.QueryRepositoryRootPath(repo).ReadToEnd();
+                if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
                 {
-                    var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
-                    ViewModels.Welcome.Instance.Refresh();
-                    _launcher?.OpenRepositoryInTab(node, null);
-                });
+                    Dispatcher.UIThread.Invoke(() =>
+                    {
+                        var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
+                        ViewModels.Welcome.Instance.Refresh();
+                        _launcher?.OpenRepositoryInTab(node, null);
+
+                        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher wnd })
+                            wnd.BringToTop();
+                    });
+
+                    return;
+                }
             }
+
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher launcher })
+                    launcher.BringToTop();
+            });
         }
 
         private void Check4Update(bool manually = false)

src/Models/IpcChannel.cs

@@ -46,14 +46,19 @@ public void SendToFirstInstance(string cmd)
                 using (var client = new NamedPipeClientStream(".", "SourceGitIPCChannel", PipeDirection.Out))
                 {
                     client.Connect(1000);
-                    if (client.IsConnected)
+                    if (!client.IsConnected)
+                        return;
+
+                    using (var writer = new StreamWriter(client))
                     {
-                        using (var writer = new StreamWriter(client))
-                        {
-                            writer.WriteLine(cmd);
-                            writer.Flush();
-                        }
+                        writer.WriteLine(cmd);
+                        writer.Flush();
                     }
+
+                    if (OperatingSystem.IsWindows())
+                        client.WaitForPipeDrain();
+                    else
+                        Thread.Sleep(1000);
                 }
             }
             catch
@@ -78,13 +83,18 @@ private async void StartServer()
                 {
                     await _server.WaitForConnectionAsync(_cancellationTokenSource.Token);
 
-                    var line = (await reader.ReadLineAsync(_cancellationTokenSource.Token))?.Trim();
-                    MessageReceived?.Invoke(line);
+                    if (!_cancellationTokenSource.IsCancellationRequested)
+                    {
+                        var line = await reader.ReadToEndAsync(_cancellationTokenSource.Token);
+                        MessageReceived?.Invoke(line?.Trim());
+                    }
+
                     _server.Disconnect();
                 }
                 catch
                 {
-                    // IGNORE
+                    if (!_cancellationTokenSource.IsCancellationRequested && _server.IsConnected)
+                        _server.Disconnect();
                 }
             }
         }

src/ViewModels/Preferences.cs

@@ -18,9 +18,8 @@ public static Preferences Instance
                 if (_instance != null)
                     return _instance;
 
-                _isLoading = true;
                 _instance = Load();
-                _isLoading = false;
+                _instance._isLoading = false;
 
                 _instance.PrepareGit();
                 _instance.PrepareShellOrTerminal();
@@ -629,8 +628,8 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         }
 
         private static Preferences _instance = null;
-        private static bool _isLoading = false;
 
+        private bool _isLoading = true;
         private bool _isReadonly = true;
         private string _locale = "en_US";
         private string _theme = "Default";

src/Views/Launcher.axaml.cs

@@ -67,6 +67,14 @@ public Launcher()
             InitializeComponent();
         }
 
+        public void BringToTop()
+        {
+            if (WindowState == WindowState.Minimized)
+                WindowState = _lastWindowState;
+            else
+                Activate();
+        }
+
         public bool HasKeyModifier(KeyModifiers modifier)
         {
             return _unhandledModifiers.HasFlag(modifier);
@@ -92,6 +100,8 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
             if (change.Property == WindowStateProperty)
             {
+                _lastWindowState = (WindowState)change.OldValue;
+
                 var state = (WindowState)change.NewValue!;
                 if (!OperatingSystem.IsMacOS() && !UseSystemWindowFrame)
                     CaptionHeight = new GridLength(state == WindowState.Maximized ? 30 : 38);
@@ -291,5 +301,6 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
         }
 
         private KeyModifiers _unhandledModifiers = KeyModifiers.None;
+        private WindowState _lastWindowState = WindowState.Normal;
     }
 }