Browse Source

ensure windowstate gets set on show.

pull/1977/head
Dan Walmsley 8 years ago
parent
commit
6e79d7869e
  1. 13
      src/Avalonia.Native.OSX/window.mm

13
src/Avalonia.Native.OSX/window.mm

@ -45,6 +45,7 @@ public:
{ {
SetPosition(lastPositionSet); SetPosition(lastPositionSet);
UpdateStyle(); UpdateStyle();
[Window makeKeyAndOrderFront:Window]; [Window makeKeyAndOrderFront:Window];
[Window setTitle:_lastTitle]; [Window setTitle:_lastTitle];
@ -359,6 +360,16 @@ private:
[Window setCanBecomeKeyAndMain]; [Window setCanBecomeKeyAndMain];
} }
virtual HRESULT Show ()
{
@autoreleasepool
{
WindowBaseImpl::Show();
return SetWindowState(_lastWindowState);
}
}
virtual HRESULT ShowDialog (IUnknown**ppv) virtual HRESULT ShowDialog (IUnknown**ppv)
{ {
@autoreleasepool @autoreleasepool
@ -511,6 +522,8 @@ private:
{ {
@autoreleasepool @autoreleasepool
{ {
_lastWindowState = state;
switch (state) { switch (state) {
case Maximized: case Maximized:
lastPositionSet.X = 0; lastPositionSet.X = 0;

Loading…
Cancel
Save