From 33ef923235aeabd07308816bb07ef790cc6c1024 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 31 Jul 2014 23:20:54 +0300 Subject: Move popup related code from viewport into popupManager. --- src/gui/widgets/textfield.cpp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'src/gui/widgets/textfield.cpp') diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index fb1bcc1db..cdfbac68a 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -70,8 +70,8 @@ #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 @@ -709,25 +709,8 @@ void TextField::mousePressed(MouseEvent &event) event.consume(); if (event.getButton() == MouseButton::RIGHT) { - if (viewport) - { - viewport->showTextFieldPopup(this); - } - else - { - if (!mPopupMenu) - { - mPopupMenu = new PopupMenu(); - mPopupMenu->postInit(); - } - if (gui) - { - int x = 0; - int y = 0; - Gui::getMouseState(&x, &y); - mPopupMenu->showTextFieldPopup(x, y, this); - } - } + if (popupManager) + popupManager->showTextFieldPopup(this); } else if (event.getButton() == MouseButton::LEFT) { -- cgit v1.2.3-60-g2f50