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

bug fixes in setFullscreen() and setEnableVRMode()

Browse source
This commit is contained in:
ZappoMan 2014-11-25 09:25:22 -08:00
parent 137642f8a5
commit a28d74570d
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -1568,6 +1568,10 @@ void Application::checkBandwidthMeterClick() {
} }
void Application::setFullscreen(bool fullscreen) { void Application::setFullscreen(bool fullscreen) {
if (Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen) != fullscreen) {
Menu::getInstance()->getActionForOption(MenuOption::Fullscreen)->setChecked(fullscreen);
}
if (Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode)) { if (Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode)) {
if (fullscreen) { if (fullscreen) {
// Menu show() after hide() doesn't work with Rift VR display so set height instead. // Menu show() after hide() doesn't work with Rift VR display so set height instead.
@ -1578,6 +1582,7 @@ void Application::setFullscreen(bool fullscreen) {
} }
_window->setWindowState(fullscreen ? (_window->windowState() | Qt::WindowFullScreen) : _window->setWindowState(fullscreen ? (_window->windowState() | Qt::WindowFullScreen) :
(_window->windowState() & ~Qt::WindowFullScreen)); (_window->windowState() & ~Qt::WindowFullScreen));
_window->show();
} }
void Application::setEnable3DTVMode(bool enable3DTVMode) { void Application::setEnable3DTVMode(bool enable3DTVMode) {
@ -1585,6 +1590,10 @@ void Application::setEnable3DTVMode(bool enable3DTVMode) {
} }
void Application::setEnableVRMode(bool enableVRMode) { void Application::setEnableVRMode(bool enableVRMode) {
if (Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode) != enableVRMode) {
Menu::getInstance()->getActionForOption(MenuOption::EnableVRMode)->setChecked(enableVRMode);
}
if (enableVRMode) { if (enableVRMode) {
if (!OculusManager::isConnected()) { if (!OculusManager::isConnected()) {
// attempt to reconnect the Oculus manager - it's possible this was a workaround // attempt to reconnect the Oculus manager - it's possible this was a workaround