[cosmetic] - nothing to see here

henke66 · May 12, 2012 · e790858 · e790858
1 parent 637d3ea
commit e790858
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm
@@ -210,17 +210,19 @@ float GetDictionaryFloat(CFDictionaryRef theDict, const void* key)
 }
 
 //---------------------------------------------------------------------------------
-void HideMenuBar()
+void SetMenuBarVisible(bool visible)
 {
-  [[NSApplication sharedApplication] 
-    setPresentationOptions:   NSApplicationPresentationHideMenuBar | 
-                              NSApplicationPresentationHideDock];
-}
-//---------------------------------------------------------------------------------        
-void ShowMenuBar()
-{
-  [[NSApplication sharedApplication] 
-    setPresentationOptions:   NSApplicationPresentationDefault];
+  if(visible)
+  {
+    [[NSApplication sharedApplication] 
+      setPresentationOptions:   NSApplicationPresentationDefault];  
+  }
+  else
+  {
+    [[NSApplication sharedApplication] 
+      setPresentationOptions:   NSApplicationPresentationHideMenuBar | 
+                                NSApplicationPresentationHideDock];  
+  }
 }
 //---------------------------------------------------------------------------------        
 CGDirectDisplayID GetDisplayID(int screen_index)
@@ -791,7 +793,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
 
       // Hide the menu bar.
       if (GetDisplayID(res.iScreen) == kCGDirectMainDisplay)
-        HideMenuBar();
+        SetMenuBarVisible(false);
 
       // Blank other displays if requested.
       if (blankOtherDisplays)
@@ -825,7 +827,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
 
       // If we don't hide menu bar, it will get events and interrupt the program.
       if (GetDisplayID(res.iScreen) == kCGDirectMainDisplay)
-        HideMenuBar();
+        SetMenuBarVisible(false);
     }
 
     // Hide the mouse.
@@ -853,7 +855,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
 
     // Show menubar.
     if (GetDisplayID(res.iScreen) == kCGDirectMainDisplay)
-      ShowMenuBar();
+      SetMenuBarVisible(true);
 
     if (g_guiSettings.GetBool("videoscreen.fakefullscreen"))
     {
@@ -1240,7 +1242,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
           NSNumber* screenID = [screenInfo objectForKey:@"NSScreenNumber"];
           if ((CGDirectDisplayID)[screenID longValue] == kCGDirectMainDisplay)
           {
-            HideMenuBar();
+            SetMenuBarVisible(false);
           }
           [window orderFront:nil];
         }