diff options
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 33 | ||||
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.h | 2 |
2 files changed, 2 insertions, 33 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 89dd6656f..689f39d0c 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -158,36 +158,6 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event A_UNUSED) { -/* - if (!emoteShortcut) - return; - - if (event.getButton() == gcn::MouseEvent::LEFT) - { - if (!mEmoteMoved && mEmoteClicked) - { - const int index = getIndexFromGrid(event.getX(), event.getY()); - - if (index == -1) - return; - -// const unsigned char emoteId = emoteShortcut->getEmote(index); - const unsigned char emoteId - = static_cast<unsigned char>(index + 1); - - if (emoteId) - { - mEmoteMoved = emoteId; - emoteShortcut->removeEmote(index); - } - } - if (mEmoteMoved) - { - mCursorPosX = event.getX(); - mCursorPosY = event.getY(); - } - } -*/ } void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event) @@ -240,8 +210,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event) emoteShortcut->useEmote(index + 1); } - if (mEmoteClicked) - mEmoteClicked = false; + mEmoteClicked = false; } } diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 3efd884a6..6929f3318 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -78,7 +78,7 @@ class EmoteShortcutContainer final : public ShortcutContainer void widgetHidden(const gcn::Event &event) override; - void setWidget2(const Widget2 *const widget); + void setWidget2(const Widget2 *const widget) override; private: std::vector<const EmoteSprite*> mEmoteImg; |