Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for warnings

Browse source 
Also overlays menu option should work better in conjunction with ui-center/fading
This commit is contained in:
Anthony J. Thibault 2016-06-09 11:27:02 -07:00
parent 5ef6847dc3
commit 6e3057479f
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/OverlayConductor.cpp
View file

@ -71,9 +71,7 @@ void OverlayConductor::update(float dt) {
} else if ((usecTimestampNow() - _timeInPotentialMode) > (nowDriving ? REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE : REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE)) {
_timeInPotentialMode = 0; // a real transition
bool wantsOverlays = Menu::getInstance()->isOptionChecked(MenuOption::Overlays);
if (wantsOverlays) {
setEnabled(!nowDriving);
}
setEnabled(!nowDriving && wantsOverlays);
_driving = nowDriving;
}

1
interface/src/ui/OverlayConductor.h
View file

@ -34,7 +34,6 @@ private:
bool _enabled { false };
bool _driving { false };
quint64 _timeInPotentialMode { 0 };
bool _wantsOverlays { true };
};
#endif