summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-04-27 13:37:31 (GMT)
committerCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-04-27 13:47:05 (GMT)
commit4c6963fe61f2d7751428669f40bc10d683b4336b (patch)
tree49cf77a239d5825231baf817b2f2161fbdb3cfdc
parent8aac700e18819d37b832aaf76fe1aedb9f259392 (diff)
downloadQt-4c6963fe61f2d7751428669f40bc10d683b4336b.zip
Qt-4c6963fe61f2d7751428669f40bc10d683b4336b.tar.gz
Qt-4c6963fe61f2d7751428669f40bc10d683b4336b.tar.bz2
Doc & menubar hidden for QtDemo after switching back from fullscreen
The problem here was fix for bug QTBUG-8933. In order to fix that bug we added a new call to the SetSystemUIMode(...) system call, but I forgot to update the status inside Qt, so the system didn't know it was in full screen mode. Task-number: QTBUG-9883 Reviewed-by: Prasanth
-rw-r--r--src/gui/widgets/qmenu_mac.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index e8400d6..aaa113b 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -2066,6 +2066,7 @@ bool QMenuBarPrivate::macUpdateMenuBarImmediatly()
cancelAllMenuTracking();
QWidget *w = findWindowThatShouldDisplayMenubar();
QMenuBar *mb = findMenubarForWindow(w);
+ extern bool qt_mac_app_fullscreen; //qapplication_mac.mm
// We need to see if we are in full screen mode, if so we need to
// switch the full screen mode to be able to show or hide the menubar.
@@ -2074,12 +2075,14 @@ bool QMenuBarPrivate::macUpdateMenuBarImmediatly()
if(w->isFullScreen()) {
// Ok, switch to showing the menubar when hovering over it.
SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
+ qt_mac_app_fullscreen = true;
}
} else if(w) {
// Removing a menubar
if(w->isFullScreen()) {
// Ok, switch to not showing the menubar when hovering on it
SetSystemUIMode(kUIModeAllHidden, 0);
+ qt_mac_app_fullscreen = true;
}
}