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

Remove View->Overlays menu

Browse source
This commit is contained in:
vladest 2018-04-19 12:01:58 +02:00
parent 60d53359bb
commit ba4ef74313
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -4819,14 +4819,10 @@ void Application::updateThreads(float deltaTime) {
} }
} }
void Application::toggleOverlays() { void Application::toggleOverlays() {}
auto menu = Menu::getInstance();
menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
}
void Application::setOverlaysVisible(bool visible) { void Application::setOverlaysVisible(bool visible) {
auto menu = Menu::getInstance(); Q_UNUSED(visible)
menu->setIsOptionChecked(MenuOption::Overlays, true);
} }
void Application::centerUI() { void Application::centerUI() {
@ -7770,7 +7766,6 @@ void Application::readArgumentsFromLocalSocket() const {
} }
void Application::showDesktop() { void Application::showDesktop() {
Menu::getInstance()->setIsOptionChecked(MenuOption::Overlays, true);
} }
CompositorHelper& Application::getApplicationCompositor() const { CompositorHelper& Application::getApplicationCompositor() const {

4
interface/src/Menu.cpp
View file

@ -202,10 +202,6 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView, addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
0, true, qApp, SLOT(rotationModeChanged())); 0, true, qApp, SLOT(rotationModeChanged()));
//TODO: remove Overlays action, but the action is tied to some other places in code
// View > Overlays
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
// View > Enter First Person Mode in HMD // View > Enter First Person Mode in HMD
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);

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

@ -143,7 +143,7 @@ void OverlayConductor::update(float dt) {
} }
bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && (0 == (_flags & SuppressMask)); bool targetVisible = (0 == (_flags & SuppressMask));
if (targetVisible != currentVisible) { if (targetVisible != currentVisible) {
offscreenUi->setPinned(!targetVisible); offscreenUi->setPinned(!targetVisible);
} }