Browse Source
Merge branch 'master' into textInputMethodClientRework
pull/11848/head
Dan Walmsley
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
3 deletions
-
src/Avalonia.Controls/Window.cs
|
|
@ -715,8 +715,8 @@ namespace Avalonia.Controls |
|
|
|
|
|
|
|
|
SetWindowStartupLocation(owner); |
|
|
SetWindowStartupLocation(owner); |
|
|
|
|
|
|
|
|
PlatformImpl?.Show(ShowActivated, false); |
|
|
|
|
|
StartRendering(); |
|
|
StartRendering(); |
|
|
|
|
|
PlatformImpl?.Show(ShowActivated, false); |
|
|
OnOpened(EventArgs.Empty); |
|
|
OnOpened(EventArgs.Empty); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -791,9 +791,8 @@ namespace Avalonia.Controls |
|
|
|
|
|
|
|
|
SetWindowStartupLocation(owner); |
|
|
SetWindowStartupLocation(owner); |
|
|
|
|
|
|
|
|
PlatformImpl?.Show(ShowActivated, true); |
|
|
|
|
|
|
|
|
|
|
|
StartRendering(); |
|
|
StartRendering(); |
|
|
|
|
|
PlatformImpl?.Show(ShowActivated, true); |
|
|
|
|
|
|
|
|
Observable.FromEventPattern( |
|
|
Observable.FromEventPattern( |
|
|
x => Closed += x, |
|
|
x => Closed += x, |
|
|
|
