Merge pull request #7537 from fr-Pursuit/master

danwalmsley · web-flow · commit f36400c978f3 · 2022-02-07T22:39:02.000Z
Minimization bugfix on Windows
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -265,7 +265,7 @@ public WindowState WindowState
             {
                 if (IsWindowVisible(_hwnd))
                 {
-                    ShowWindow(value, true);
+                    ShowWindow(value, value != WindowState.Minimized); // If the window is minimized, it shouldn't be activated
                 }
 
                 _showWindowState = value;                
@@ -973,7 +973,7 @@ private void ShowWindow(WindowState state, bool activate)
             {
                 case WindowState.Minimized:
                     newWindowProperties.IsFullScreen = false;
-                    command = activate ? ShowWindowCommand.Minimize : ShowWindowCommand.ShowMinNoActive;
+                    command = ShowWindowCommand.Minimize;
                     break;
                 case WindowState.Maximized:
                     newWindowProperties.IsFullScreen = false;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public WindowState WindowState`
`265`	`265`	`{`
`266`	`266`	`if (IsWindowVisible(_hwnd))`
`267`	`267`	`{`
`268`		`- ShowWindow(value, true);`
	`268`	`+ ShowWindow(value, value != WindowState.Minimized); // If the window is minimized, it shouldn't be activated`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`_showWindowState = value;`
`@@ -973,7 +973,7 @@ private void ShowWindow(WindowState state, bool activate)`
`973`	`973`	`{`
`974`	`974`	`case WindowState.Minimized:`
`975`	`975`	`newWindowProperties.IsFullScreen = false;`
`976`		`- command = activate ? ShowWindowCommand.Minimize : ShowWindowCommand.ShowMinNoActive;`
	`976`	`+ command = ShowWindowCommand.Minimize;`
`977`	`977`	`break;`
`978`	`978`	`case WindowState.Maximized:`
`979`	`979`	`newWindowProperties.IsFullScreen = false;`