Add ability to switch emotes shortcurs bar between player, pets, homunculuses and mercenaries.

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)