diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 420818d931..663902d90f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4819,14 +4819,10 @@ void Application::updateThreads(float deltaTime) { } } -void Application::toggleOverlays() { - auto menu = Menu::getInstance(); - menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays)); -} +void Application::toggleOverlays() {} void Application::setOverlaysVisible(bool visible) { - auto menu = Menu::getInstance(); - menu->setIsOptionChecked(MenuOption::Overlays, true); + Q_UNUSED(visible) } void Application::centerUI() { @@ -7770,7 +7766,6 @@ void Application::readArgumentsFromLocalSocket() const { } void Application::showDesktop() { - Menu::getInstance()->setIsOptionChecked(MenuOption::Overlays, true); } CompositorHelper& Application::getApplicationCompositor() const { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 70f32dd216..6b199896f4 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -202,10 +202,6 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView, 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 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true); diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp index ed8fa53fe2..b265849f62 100644 --- a/interface/src/ui/OverlayConductor.cpp +++ b/interface/src/ui/OverlayConductor.cpp @@ -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) { offscreenUi->setPinned(!targetVisible); }