Merge remote-tracking branch 'origin/textInputMethodClientRework' into textInputMethodClientRework

3 years ago · a0d5d9d124
1 changed files with 2 additions and 3 deletions
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@ -715,8 +715,8 @@ namespace Avalonia.Controls

                SetWindowStartupLocation(owner);

-                PlatformImpl?.Show(ShowActivated, false);
                StartRendering();
+                PlatformImpl?.Show(ShowActivated, false);
                OnOpened(EventArgs.Empty);
            }
        }
@ -791,9 +791,8 @@ namespace Avalonia.Controls

                SetWindowStartupLocation(owner);

-                PlatformImpl?.Show(ShowActivated, true);
-
                StartRendering();
+                PlatformImpl?.Show(ShowActivated, true);

                Observable.FromEventPattern(
                        x => Closed += x,