From 03c3e794097676888234b3cc82c01228dcbe48c8 Mon Sep 17 00:00:00 2001
From: Joe Moon <joe@xoxomoon.com>
Date: Fri, 27 Apr 2018 17:38:57 -0700
Subject: [PATCH] macOS: fix subtle regression introduced in 0474dc986

---
 src/platform/macos/window.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/platform/macos/window.rs b/src/platform/macos/window.rs
index e32fb59fc..610249a80 100644
--- a/src/platform/macos/window.rs
+++ b/src/platform/macos/window.rs
@@ -634,8 +634,8 @@ impl Window2 {
             let masks = if pl_attrs.titlebar_hidden {
                 NSWindowStyleMask::NSBorderlessWindowMask |
                     NSWindowStyleMask::NSResizableWindowMask
-            } else if pl_attrs.titlebar_transparent {
-                // Window2 with a transparent titlebar and regular content view
+            } else if !pl_attrs.titlebar_transparent {
+                // Window2 with a titlebar
                 NSWindowStyleMask::NSClosableWindowMask |
                     NSWindowStyleMask::NSMiniaturizableWindowMask |
                     NSWindowStyleMask::NSResizableWindowMask |
@@ -647,17 +647,15 @@ impl Window2 {
                     NSWindowStyleMask::NSResizableWindowMask |
                     NSWindowStyleMask::NSTitledWindowMask |
                     NSWindowStyleMask::NSFullSizeContentViewWindowMask
+            } else if !attrs.decorations && !screen.is_some() {
+                // Window2 without a titlebar
+                NSWindowStyleMask::NSBorderlessWindowMask
             } else {
-                if !attrs.decorations && !screen.is_some() {
-                    // Window2 without a titlebar
-                    NSWindowStyleMask::NSBorderlessWindowMask
-                } else {
-                    // Window2 with a titlebar
-                    NSWindowStyleMask::NSClosableWindowMask |
-                        NSWindowStyleMask::NSMiniaturizableWindowMask |
-                        NSWindowStyleMask::NSResizableWindowMask |
-                        NSWindowStyleMask::NSTitledWindowMask
-                }
+                // Window2 with a transparent titlebar and regular content view
+                NSWindowStyleMask::NSClosableWindowMask |
+                    NSWindowStyleMask::NSMiniaturizableWindowMask |
+                    NSWindowStyleMask::NSResizableWindowMask |
+                    NSWindowStyleMask::NSTitledWindowMask
             };
 
             let winit_window = Class::get("WinitWindow").unwrap_or_else(|| {