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/windows/chatwindow.cpp | |
| parent | 829cd57e021ea85cffdbd3f3a7b18da835e00b7c (diff) | |
| download | manaverse-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.gz manaverse-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.bz2 manaverse-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.tar.xz manaverse-2cb9f5c3d47077a459fabf15800b1c45cfdacb3a.zip | |
Remove proxy methods used for access popup menu.
Diffstat (limited to 'src/gui/windows/chatwindow.cpp')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 2cee38db7..363af7284 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -45,9 +45,12 @@ #include "gui/gui.h" #include "gui/popupmanager.h" #include "gui/skin.h" +#include "gui/viewport.h" #include "gui/models/colorlistmodel.h" +#include "gui/popups/popupmenu.h" + #include "gui/windows/emotewindow.h" #include "gui/windows/setupwindow.h" #include "gui/widgets/tabbedarea.h" @@ -657,7 +660,7 @@ void ChatWindow::mousePressed(MouseEvent &event) if (event.getButton() == MouseButton::RIGHT) { - if (popupManager) + if (popupMenu) { Tab *const tab = mChatTabs->getSelectedTab(); if (tab) @@ -674,7 +677,11 @@ void ChatWindow::mousePressed(MouseEvent &event) { ChatTab *const cTab = dynamic_cast<ChatTab*>(tab); if (cTab) - popupManager->showChatPopup(cTab); + { + popupMenu->showChatPopup(viewport->getMouseX(), + viewport->getMouseY(), + cTab); + } } } } |