summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-10 02:03:33 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-10 02:03:33 +0300
commitb97afbb756202e148b980b3311e2c4cc3dd1cbaf (patch)
tree15c45e87fe175155a219fa9e50bc6ff74b2cc1e4 /src/gui/widgets
parentd94f088b0f81fb114980830d8fb53a5ee911b6e6 (diff)
downloadplus-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.gz
plus-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.bz2
plus-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.xz
plus-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.zip
Add ability to switch emotes shortcurs bar between player, pets, homunculuses and mercenaries.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 7d15ba4a2..0b004cdad 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -31,6 +31,7 @@
#include "gui/shortcut/emoteshortcut.h"
+#include "gui/popups/popupmenu.h"
#include "gui/popups/textpopup.h"
#include "input/inputactionoperators.h"
@@ -192,6 +193,9 @@ void EmoteShortcutContainer::mouseDragged(MouseEvent &restrict event A_UNUSED)
void EmoteShortcutContainer::mousePressed(MouseEvent &restrict event) restrict2
{
+ if (event.isConsumed())
+ return;
+
if (event.getButton() == MouseButton::LEFT)
{
if (!emoteShortcut)
@@ -214,6 +218,14 @@ void EmoteShortcutContainer::mousePressed(MouseEvent &restrict event) restrict2
mEmoteClicked = true;
}
}
+ else if (event.getButton() == MouseButton::RIGHT)
+ {
+ if (popupMenu)
+ {
+ event.consume();
+ popupMenu->showEmoteType();
+ }
+ }
}
void EmoteShortcutContainer::mouseReleased(MouseEvent &restrict event)