From a9ddb1992d186d559f24370a33a987e281c134c5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Dec 2012 02:50:13 +0300 Subject: Hide screen buttons and joystick if setup window is opened. --- src/gui/setup.cpp | 23 +++++++---------------- src/gui/setup.h | 2 ++ 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'src/gui') diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 9677e052a..ab7179257 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "game.h" #include "main.h" +#include "touchmanager.h" #include "gui/setup_audio.h" #include "gui/setup_chat.h" @@ -209,22 +210,12 @@ void Setup::activateTab(const std::string &name) { std::string tmp = gettext(name.c_str()); mPanel->setSelectedTabByName(tmp); -/* - for (std::list::const_iterator it = mTabs.begin(); - it != mTabs.end(); ++it) - { - if (*it) - { - SetupTab *tab = *it; - logger->log("check tab: " + tab->getName()); - if (tab->getName() == tmp) - { - mPanel->setSelectedTabByName(name); - return; - } - } - } -*/ +} + +void Setup::setVisible(bool visible) +{ + touchManager.setTempHide(visible); + Window::setVisible(visible); } Setup *setupWindow; diff --git a/src/gui/setup.h b/src/gui/setup.h index ef6521700..51a4e5c26 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -76,6 +76,8 @@ class Setup final : public Window, public gcn::ActionListener void activateTab(const std::string &name); + void setVisible(bool visible) override; + private: std::list mTabs; std::list mWindowsToReset; -- cgit v1.2.3-70-g09d2