Use WinForms API to check for minimized (#10088)

gitextensions · Jul 27, 2022 · 35e75c5 · 35e75c5
1 parent 02173f3
commit 35e75c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/GitUI/CommandsDialogs/BrowseDialog/GitStatusMonitor.cs b/GitUI/CommandsDialogs/BrowseDialog/GitStatusMonitor.cs
@@ -51,6 +51,7 @@ public sealed class GitStatusMonitor : IDisposable
         private string? _submodulesPath;
         private readonly CancellationTokenSequence _statusSequence = new();
         private readonly GetAllChangedFilesOutputParser _getAllChangedFilesOutputParser;
+        private readonly Func<bool> _isMinimized;
 
         // Timestamps to schedule status updates, limit the update interval dynamically
         // Note that TickCount wraps after 25 days uptime, always compare diff
@@ -79,8 +80,9 @@ public bool Active
         /// </summary>
         public event EventHandler<GitWorkingDirectoryStatusEventArgs?>? GitWorkingDirectoryStatusChanged;
 
-        public GitStatusMonitor(IGitUICommandsSource commandsSource)
+        public GitStatusMonitor(IGitUICommandsSource commandsSource, Func<bool> isMinimized)
         {
+            _isMinimized = isMinimized;
             _timerRefresh = new System.Windows.Forms.Timer
             {
                 Enabled = true,
@@ -354,22 +356,6 @@ private void StartWatchingChanges(string workTreePath, string gitDirPath)
             }
         }
 
-        private static bool IsMinimized()
-        {
-            if (!EnvUtils.RunningOnWindows())
-            {
-                return false;
-            }
-
-            var currentProcess = Process.GetCurrentProcess();
-            if (currentProcess is null)
-            {
-                return false;
-            }
-
-            return NativeMethods.IsIconic(currentProcess.MainWindowHandle).IsTrue();
-        }
-
         private void Update()
         {
             ThreadHelper.AssertOnUIThread();
@@ -383,7 +369,7 @@ private void Update()
             Validates.NotNull(UICommandsSource);
             Validates.NotNull(Module);
 
-            if (IsMinimized() || UICommandsSource.UICommands.RepoChangedNotifier.IsLocked)
+            if (_isMinimized() || UICommandsSource.UICommands.RepoChangedNotifier.IsLocked)
             {
                 // No run for minimized,
                 // don't update status while repository is being modified by GitExt,

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -331,7 +331,7 @@ void InitCountArtificial(out GitStatusMonitor gitStatusMonitor)
             {
                 Brush? lastBrush = null;
 
-                gitStatusMonitor = new GitStatusMonitor(this);
+                gitStatusMonitor = new GitStatusMonitor(this, () => IsMinimized());
                 if (!NeedsGitStatusMonitor())
                 {
                     gitStatusMonitor.Active = false;
@@ -417,6 +417,8 @@ void InitCountArtificial(out GitStatusMonitor gitStatusMonitor)
                 };
             }
 
+            bool IsMinimized() => WindowState == FormWindowState.Minimized;
+
             void WorkaroundPaddingIncreaseBug()
             {
                 MainSplitContainer.Panel1.Padding = new Padding(1);

diff --git a/GitUI/Interops/User32/IsIconic.cs b/GitUI/Interops/User32/IsIconic.cs