Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle a couple edge cases

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-07 13:32:26 -07:00
parent 81bb5ff07d
commit 09004680d0
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -2171,12 +2171,23 @@ void Application::keyPressEvent(QKeyEvent* event) {
case CAMERA_MODE_ENTITY: case CAMERA_MODE_ENTITY:
_returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode; _returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode;
break; break;
default:
_returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
break;
} }
} }
bool isMirrorChecked = Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror); bool isMirrorChecked = Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror);
Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, !isMirrorChecked); Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, !isMirrorChecked);
if (isMirrorChecked) { if (isMirrorChecked) {
// if we got here without coming in from a non-Full Screen mirror case, then our
// _returnFromFullScreenMirrorTo is unknown. In that case we'll go to the old
// behavior of returning to ThirdPerson
if (_returnFromFullScreenMirrorTo.isEmpty()) {
_returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
}
Menu::getInstance()->setIsOptionChecked(_returnFromFullScreenMirrorTo, true); Menu::getInstance()->setIsOptionChecked(_returnFromFullScreenMirrorTo, true);
} }
cameraMenuChanged(); cameraMenuChanged();