Browse Source

remove isChild flag.

pull/3943/head
Dan Walmsley 6 years ago
parent
commit
84fafd6547
  1. 5
      native/Avalonia.Native/src/OSX/window.mm

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

@ -29,7 +29,6 @@ public:
NSString* _lastTitle; NSString* _lastTitle;
IAvnMenu* _mainMenu; IAvnMenu* _mainMenu;
bool _shown; bool _shown;
bool _isChild;
WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl) WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
{ {
@ -37,7 +36,6 @@ public:
_mainMenu = nullptr; _mainMenu = nullptr;
BaseEvents = events; BaseEvents = events;
_glContext = gl; _glContext = gl;
_isChild = false;
renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext: gl]; renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext: gl];
View = [[AvnView alloc] initWithParent:this]; View = [[AvnView alloc] initWithParent:this];
@ -528,7 +526,6 @@ private:
if(cparent == nullptr) if(cparent == nullptr)
return E_INVALIDARG; return E_INVALIDARG;
_isChild = true;
[cparent->Window addChildWindow:Window ordered:NSWindowAbove]; [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
UpdateStyle(); UpdateStyle();
@ -904,7 +901,7 @@ protected:
break; break;
} }
if(!_isChild) if([Window parentWindow] == nullptr)
{ {
s |= NSWindowStyleMaskMiniaturizable; s |= NSWindowStyleMaskMiniaturizable;
} }

Loading…
Cancel
Save