From 2cb9f5c3d47077a459fabf15800b1c45cfdacb3a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Aug 2014 13:40:14 +0300 Subject: Remove proxy methods used for access popup menu. --- src/gui/widgets/textfield.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets/textfield.cpp') 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) { -- cgit v1.2.3-70-g09d2