summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-02 14:49:47 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-02 14:49:47 +0300
commit85c9ac79bfaf5e428d9e713841b0e4495eb413f7 (patch)
treef3fe35f6449a600cbe771daccb6b68f8962fe4c7 /src/gui
parent05ed1621031f4e1b23af1fafd54e0990967d6bd9 (diff)
downloadplus-85c9ac79bfaf5e428d9e713841b0e4495eb413f7.tar.gz
plus-85c9ac79bfaf5e428d9e713841b0e4495eb413f7.tar.bz2
plus-85c9ac79bfaf5e428d9e713841b0e4495eb413f7.tar.xz
plus-85c9ac79bfaf5e428d9e713841b0e4495eb413f7.zip
improve emoteshortcutcontainer.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp33
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h2
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;