]> git.sesse.net Git - vlc/commitdiff
macosx: simplify style mask options on window creation
authorDavid Fuhrmann <david.fuhrmann@googlemail.com>
Thu, 13 Sep 2012 10:14:31 +0000 (12:14 +0200)
committerDavid Fuhrmann <david.fuhrmann@googlemail.com>
Thu, 13 Sep 2012 13:29:05 +0000 (15:29 +0200)
modules/gui/macosx/MainWindow.m

index b1fb1b878d9f5170c5ab5379ff5fa54756f676d2..f015f25594b7109cebec4586c97123c3458d87b2 100644 (file)
@@ -89,13 +89,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
     b_dark_interface = config_GetInt(VLCIntf, "macosx-interfacestyle");
 
     if (b_dark_interface) {
+        styleMask = NSBorderlessWindowMask;
 #ifdef MAC_OS_X_VERSION_10_7
         if (!OSX_SNOW_LEOPARD)
-            styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
-        else
-            styleMask = NSBorderlessWindowMask;
-#else
-        styleMask = NSBorderlessWindowMask;
+            styleMask |= NSResizableWindowMask;
 #endif
     }
 
@@ -2944,13 +2941,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
     b_dark_interface = config_GetInt(VLCIntf, "macosx-interfacestyle");
 
     if (b_dark_interface) {
+        styleMask = NSBorderlessWindowMask;
 #ifdef MAC_OS_X_VERSION_10_7
         if (!OSX_SNOW_LEOPARD)
-            styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
-        else
-            styleMask = NSBorderlessWindowMask;
-#else
-        styleMask = NSBorderlessWindowMask;
+            styleMask |= NSResizableWindowMask;
 #endif
     }