Merge branch 'master' into nativehostcontrol-emptybounds-fix

6 years ago · 3029f7f7f8
1 changed files with 1 additions and 1 deletions
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@ -958,7 +958,7 @@ namespace Avalonia.Win32
                MaximizeWithoutCoveringTaskbar();
            }
-            if (!Design.IsDesignMode)
+            if (!Design.IsDesignMode && activate)
            {
                SetFocus(_hwnd);
            }