Browse Source

Merge pull request #8618 from AvaloniaUI/fixes/macos-dont-reopen-hidden-window

macos: Don't reopen hidden window when parent clicked.
# Conflicts:
#	tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
pull/8753/head
Dan Walmsley 4 years ago
parent
commit
46d83d1fbe
  1. 2
      native/Avalonia.Native/src/OSX/WindowImpl.mm
  2. 1
      samples/IntegrationTestApp/MainWindow.axaml.cs
  3. 3
      samples/IntegrationTestApp/ShowWindowTest.axaml

2
native/Avalonia.Native/src/OSX/WindowImpl.mm

@ -120,7 +120,7 @@ void WindowImpl::BringToFront()
{
if(Window != nullptr)
{
if (![Window isMiniaturized])
if ([Window isVisible] && ![Window isMiniaturized])
{
if(IsDialog())
{

1
samples/IntegrationTestApp/MainWindow.axaml.cs

@ -99,6 +99,7 @@ namespace IntegrationTestApp
foreach (var window in lifetime.Windows)
{
window.Show();
if (window.WindowState == WindowState.Minimized)
window.WindowState = WindowState.Normal;
}

3
samples/IntegrationTestApp/ShowWindowTest.axaml

@ -3,7 +3,7 @@
x:Class="IntegrationTestApp.ShowWindowTest"
Name="SecondaryWindow"
Title="Show Window Test">
<Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<Label Grid.Column="0" Grid.Row="1">Client Size</Label>
<TextBox Name="ClientSize" Grid.Column="1" Grid.Row="1" IsReadOnly="True"
Text="{Binding ClientSize, Mode=OneWay}"/>
@ -31,5 +31,6 @@
<ComboBoxItem>Maximized</ComboBoxItem>
<ComboBoxItem>Fullscreen</ComboBoxItem>
</ComboBox>
<Button Name="HideButton" Grid.Row="8" Command="{Binding $parent[Window].Hide}">Hide</Button>
</Grid>
</Window>

Loading…
Cancel
Save