[vlc-commits] macosx: simplify style mask options on window creation

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Thu Sep 13 12:14:31 2012 +0200| [8c59214e3e86fd954913866819802fd4489eaa63] | committer: David Fuhrmann

macosx: simplify style mask options on window creation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c59214e3e86fd954913866819802fd4489eaa63
---

 modules/gui/macosx/MainWindow.m |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index b1fb1b8..f015f25 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -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
     }