Browse Source

Merge pull request #3680 from AvaloniaUI/fix/osx-window-state-binding

Fix OSX binding to WindowState.
release/0.9.5
danwalmsley 6 years ago
committed by Dan Walmsley
parent
commit
f578639d75
  1. 3
      native/Avalonia.Native/src/OSX/window.mm

3
native/Avalonia.Native/src/OSX/window.mm

@ -427,6 +427,7 @@ private:
ComPtr<IAvnWindowEvents> WindowEvents; ComPtr<IAvnWindowEvents> WindowEvents;
WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl) WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
{ {
_lastWindowState = Normal;
WindowEvents = events; WindowEvents = events;
[Window setCanBecomeKeyAndMain]; [Window setCanBecomeKeyAndMain];
[Window disableCursorRects]; [Window disableCursorRects];
@ -440,7 +441,7 @@ private:
[[Window parentWindow] removeChildWindow:Window]; [[Window parentWindow] removeChildWindow:Window];
WindowBaseImpl::Show(); WindowBaseImpl::Show();
return SetWindowState(Normal); return SetWindowState(_lastWindowState);
} }
} }

Loading…
Cancel
Save