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/window.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/window.cpp')
| -rw-r--r-- | src/gui/widgets/window.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index f2f7c1dd1..a4fb2d57f 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -74,6 +74,7 @@ #include "gui/focushandler.h" #include "gui/gui.h" +#include "gui/popupmanager.h" #include "gui/skin.h" #include "gui/viewport.h" @@ -763,10 +764,10 @@ void Window::mousePressed(MouseEvent &event) } else if (button == MouseButton::RIGHT) { - if (viewport) + if (popupManager) { event.consume(); - viewport->showWindowPopup(this); + popupManager->showWindowPopup(this); } } } @@ -837,8 +838,11 @@ void Window::updateResizeHandler(MouseEvent &event) void Window::mouseMoved(MouseEvent &event) { updateResizeHandler(event); - if (viewport) - viewport->hideBeingPopup(); + if (popupManager) + { + popupManager->hideBeingPopup(); + popupManager->hideTextPopup(); + } } bool Window::canMove() const |