Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-02 08:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5623 from ZappoMan/fullScreenMenuFix

Browse source 
Hide Menubar on non-mac OS when going to fullscreen
This commit is contained in:
Brad Davis 2015-08-20 21:44:31 -07:00
commit b635ddc7f9
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
interface/src/Application.cpp
View file

@ -1744,6 +1744,27 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) {
return; return;
} }
#ifndef Q_OS_MAC
// If in full screen, and our main windows menu bar is hidden, and we're close to the top of the QMainWindow
// then show the menubar.
if (_window->isFullScreen()) {
QMenuBar* menuBar = _window->menuBar();
if (menuBar) {
static const int MENU_TOGGLE_AREA = 10;
if (!menuBar->isVisible()) {
if (event->pos().y() <= MENU_TOGGLE_AREA) {
menuBar->setVisible(true);
}
} else {
if (event->pos().y() > MENU_TOGGLE_AREA) {
menuBar->setVisible(false);
}
}
}
}
#endif
_entities.mouseMoveEvent(event, deviceID); _entities.mouseMoveEvent(event, deviceID);
_controllerScriptingInterface.emitMouseMoveEvent(event, deviceID); // send events to any registered scripts _controllerScriptingInterface.emitMouseMoveEvent(event, deviceID); // send events to any registered scripts
@ -4985,6 +5006,14 @@ void Application::setFullscreen(const QScreen* target) {
#endif #endif
_window->windowHandle()->setScreen((QScreen*)target); _window->windowHandle()->setScreen((QScreen*)target);
_window->showFullScreen(); _window->showFullScreen();
#ifndef Q_OS_MAC
// also hide the QMainWindow's menuBar
QMenuBar* menuBar = _window->menuBar();
if (menuBar) {
menuBar->setVisible(false);
}
#endif
} }
void Application::unsetFullscreen(const QScreen* avoid) { void Application::unsetFullscreen(const QScreen* avoid) {
@ -5015,6 +5044,14 @@ void Application::unsetFullscreen(const QScreen* avoid) {
#else #else
_window->setGeometry(targetGeometry); _window->setGeometry(targetGeometry);
#endif #endif
#ifndef Q_OS_MAC
// also show the QMainWindow's menuBar
QMenuBar* menuBar = _window->menuBar();
if (menuBar) {
menuBar->setVisible(true);
}
#endif
} }