diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-17 13:40:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-17 13:40:14 +0300 |
| commit | 2cb9f5c3d47077a459fabf15800b1c45cfdacb3a (patch) | |
| tree | ad6eba1142495acd31dc8a50b56988a26350f2d5 /src/gui/widgets/textfield.cpp | |
| parent | 829cd57e021ea85cffdbd3f3a7b18da835e00b7c (diff) | |
| download | plus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.gz plus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.bz2 plus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.xz plus-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.zip | |
Remove proxy methods used for access popup menu.
Diffstat (limited to 'src/gui/widgets/textfield.cpp')
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index adb455432..0810b9395 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -70,14 +70,16 @@ #include "input/inputmanager.h" #include "gui/gui.h" -#include "gui/popupmanager.h" #include "gui/skin.h" +#include "gui/viewport.h" #ifdef ANDROID #include "gui/windowmanager.h" #endif #include "gui/fonts/font.h" +#include "gui/popups/popupmenu.h" + #include "resources/image.h" #include "resources/imagerect.h" @@ -703,8 +705,12 @@ void TextField::mousePressed(MouseEvent &event) event.consume(); if (event.getButton() == MouseButton::RIGHT) { - if (popupManager) - popupManager->showTextFieldPopup(this); + if (popupMenu) + { + popupMenu->showTextFieldPopup(viewport->getMouseX(), + viewport->getMouseY(), + this); + } } else if (event.getButton() == MouseButton::LEFT) { |