summaryrefslogtreecommitdiff
path: root/src/actionmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-31 23:20:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-31 23:20:54 +0300
commit33ef923235aeabd07308816bb07ef790cc6c1024 (patch)
treee50c8bbefae98bc57e5b804ba145bca2005c5ca7 /src/actionmanager.cpp
parentb6bd4b5d68df33d12f18a67de2e54e016a0935fe (diff)
downloadmv-33ef923235aeabd07308816bb07ef790cc6c1024.tar.gz
mv-33ef923235aeabd07308816bb07ef790cc6c1024.tar.bz2
mv-33ef923235aeabd07308816bb07ef790cc6c1024.tar.xz
mv-33ef923235aeabd07308816bb07ef790cc6c1024.zip
Move popup related code from viewport into popupManager.
Diffstat (limited to 'src/actionmanager.cpp')
-rw-r--r--src/actionmanager.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 39884f8c2..004c997f9 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -38,6 +38,7 @@
#include "gui/dialogsmanager.h"
#include "gui/gui.h"
+#include "gui/popupmanager.h"
#include "gui/sdlinput.h"
#include "gui/viewport.h"
@@ -363,9 +364,9 @@ impHandler0(quit)
{
if (!Game::instance())
return false;
- if (viewport && viewport->isPopupMenuVisible())
+ if (popupManager && popupManager->isPopupMenuVisible())
{
- viewport->closePopupMenu();
+ popupManager->closePopupMenu();
return true;
}
else if (!quitDialog)
@@ -1121,9 +1122,9 @@ impHandler0(showKeyboard)
impHandler0(showWindows)
{
- if (viewport)
+ if (popupManager)
{
- viewport->showWindowsPopup();
+ popupManager->showWindowsPopup();
return true;
}
return false;