diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-31 23:20:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-31 23:20:54 +0300 |
| commit | 33ef923235aeabd07308816bb07ef790cc6c1024 (patch) | |
| tree | e50c8bbefae98bc57e5b804ba145bca2005c5ca7 /src/gui/widgets/popup.cpp | |
| parent | b6bd4b5d68df33d12f18a67de2e54e016a0935fe (diff) | |
| download | manaplus-33ef923235aeabd07308816bb07ef790cc6c1024.tar.gz manaplus-33ef923235aeabd07308816bb07ef790cc6c1024.tar.bz2 manaplus-33ef923235aeabd07308816bb07ef790cc6c1024.tar.xz manaplus-33ef923235aeabd07308816bb07ef790cc6c1024.zip | |
Move popup related code from viewport into popupManager.
Diffstat (limited to 'src/gui/widgets/popup.cpp')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 506b0f050..96faf19c4 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -25,8 +25,10 @@ #include "graphicsvertexes.h" +#include "gui/popupmanager.h" #include "gui/skin.h" -#include "gui/viewport.h" + +#include "gui/widgets/windowcontainer.h" #include "utils/delete2.h" @@ -229,8 +231,11 @@ void Popup::position(const int x, const int y) void Popup::mouseMoved(MouseEvent &event A_UNUSED) { - if (viewport) - viewport->hideBeingPopup(); + if (popupManager) + { + popupManager->hideBeingPopup(); + popupManager->hideTextPopup(); + } mRedraw = true; } |