Browse Source

rename _hasDecorations to _decorations.

pull/3849/head
Dan Walmsley 6 years ago
parent
commit
47f3b2c810
  1. 12
      native/Avalonia.Native/src/OSX/window.mm

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

@ -405,7 +405,7 @@ class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, pub
{ {
private: private:
bool _canResize = true; bool _canResize = true;
SystemDecorations _hasDecorations = SystemDecorationsFull; SystemDecorations _decorations = SystemDecorationsFull;
CGRect _lastUndecoratedFrame; CGRect _lastUndecoratedFrame;
AvnWindowState _lastWindowState; AvnWindowState _lastWindowState;
bool _inSetWindowState; bool _inSetWindowState;
@ -493,12 +493,12 @@ private:
bool IsZoomed () bool IsZoomed ()
{ {
return _hasDecorations != SystemDecorationsNone ? [Window isZoomed] : UndecoratedIsMaximized(); return _decorations != SystemDecorationsNone ? [Window isZoomed] : UndecoratedIsMaximized();
} }
void DoZoom() void DoZoom()
{ {
switch (_hasDecorations) switch (_decorations)
{ {
case SystemDecorationsNone: case SystemDecorationsNone:
if (!UndecoratedIsMaximized()) if (!UndecoratedIsMaximized())
@ -530,10 +530,10 @@ private:
{ {
@autoreleasepool @autoreleasepool
{ {
_hasDecorations = value; _decorations = value;
UpdateStyle(); UpdateStyle();
switch (_hasDecorations) switch (_decorations)
{ {
case SystemDecorationsNone: case SystemDecorationsNone:
[Window setHasShadow:NO]; [Window setHasShadow:NO];
@ -725,7 +725,7 @@ protected:
{ {
unsigned long s = NSWindowStyleMaskBorderless; unsigned long s = NSWindowStyleMaskBorderless;
switch (_hasDecorations) switch (_decorations)
{ {
case SystemDecorationsNone: case SystemDecorationsNone:
break; break;

Loading…
Cancel
Save