From d44ad423a0b2fec410a3917dcfb27d2187e9c8b4 Mon Sep 17 00:00:00 2001
From: Nathan Garside <nathan@pixelatedlabs.com>
Date: Mon, 10 Feb 2020 09:08:33 +0000
Subject: [PATCH] Use enum in macOS native

---
 native/Avalonia.Native/src/OSX/window.h  |   6 ++
 native/Avalonia.Native/src/OSX/window.mm | 100 +++++++++++++----------
 2 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index 3e626675d2..23e3c22db7 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -36,4 +36,10 @@ struct IWindowStateChanged
     virtual void WindowStateChanged () = 0;
 };
 
+typedef NS_ENUM(NSInteger, SystemDecorations) {
+    SystemDecorationsNone = 0,
+    SystemDecorationsBorderOnly = 1,
+    SystemDecorationsFull = 2,
+};
+
 #endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 317d03162b..4c70f661b7 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -410,7 +410,7 @@ class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, pub
 {
 private:
     bool _canResize = true;
-    int _hasDecorations = 2;
+    SystemDecorations _hasDecorations = SystemDecorationsFull;
     CGRect _lastUndecoratedFrame;
     AvnWindowState _lastWindowState;
     
@@ -475,23 +475,26 @@ private:
     
     bool IsZoomed ()
     {
-        return _hasDecorations > 0 ? [Window isZoomed] : UndecoratedIsMaximized();
+        return _hasDecorations != SystemDecorationsNone ? [Window isZoomed] : UndecoratedIsMaximized();
     }
     
     void DoZoom()
     {
-        if (_hasDecorations > 0)
+        switch (_hasDecorations)
         {
-            [Window performZoom:Window];
-        }
-        else
-        {
-            if (!UndecoratedIsMaximized())
-            {
-                _lastUndecoratedFrame = [Window frame];
-            }
-            
-            [Window zoom:Window];
+            case SystemDecorationsNone:
+                if (!UndecoratedIsMaximized())
+                {
+                    _lastUndecoratedFrame = [Window frame];
+                }
+                
+                [Window zoom:Window];
+                break;
+
+            case SystemDecorationsBorderOnly:
+            case SystemDecorationsFull:
+                [Window performZoom:Window];
+                break;
         }
     }
     
@@ -509,32 +512,31 @@ private:
     {
         @autoreleasepool
         {
-            _hasDecorations = value;
+            _hasDecorations = (SystemDecorations)value;
             UpdateStyle();
-            
-            // full
-            if (_hasDecorations == 2)
-            {
-                [Window setHasShadow:YES];
-                [Window setTitleVisibility:NSWindowTitleVisible];
-                [Window setTitlebarAppearsTransparent:NO];
-                [Window setTitle:_lastTitle];
-            }
-            // border only
-            else if (_hasDecorations == 1)
-            {
-                [Window setHasShadow:YES];
-                [Window setTitleVisibility:NSWindowTitleHidden];
-                [Window setTitlebarAppearsTransparent:YES];
-            }
-            // none
-            else
+
+            switch (_hasDecorations)
             {
-                [Window setHasShadow:NO];
-                [Window setTitleVisibility:NSWindowTitleHidden];
-                [Window setTitlebarAppearsTransparent:YES];
+                case SystemDecorationsNone:
+                    [Window setHasShadow:NO];
+                    [Window setTitleVisibility:NSWindowTitleHidden];
+                    [Window setTitlebarAppearsTransparent:YES];
+                    break;
+
+                case SystemDecorationsBorderOnly:
+                    [Window setHasShadow:YES];
+                    [Window setTitleVisibility:NSWindowTitleHidden];
+                    [Window setTitlebarAppearsTransparent:YES];
+                    break;
+
+                case SystemDecorationsFull:
+                    [Window setHasShadow:YES];
+                    [Window setTitleVisibility:NSWindowTitleVisible];
+                    [Window setTitlebarAppearsTransparent:NO];
+                    [Window setTitle:_lastTitle];
+                    break;
             }
-            
+
             return S_OK;
         }
     }
@@ -666,12 +668,26 @@ protected:
     virtual NSWindowStyleMask GetStyle() override
     {
         unsigned long s = NSWindowStyleMaskBorderless;
-        if(_hasDecorations == 1)
-            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
-        if(_hasDecorations == 2)
-            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskBorderless;
-        if(_hasDecorations == 2 && _canResize)
-            s = s | NSWindowStyleMaskResizable;
+
+        switch (_hasDecorations)
+        {
+            case SystemDecorationsNone:
+                break;
+
+            case SystemDecorationsBorderOnly:
+                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
+                break;
+
+            case SystemDecorationsFull:
+                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskBorderless;
+                if(_canResize)
+                {
+                    s = s | NSWindowStyleMaskResizable;
+                }
+
+                break;
+        }
+
         return s;
     }
 };