summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-17 14:24:14 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-17 14:24:14 +0300
commit26c97eda5cb85b253706d49afff55580ace9e5bf (patch)
treeac7309e98580d9afacda539f3fff5c432cf308e0
parent19c60fcd436778c020145e58817ed443a53478d9 (diff)
downloadplus-26c97eda5cb85b253706d49afff55580ace9e5bf.tar.gz
plus-26c97eda5cb85b253706d49afff55580ace9e5bf.tar.bz2
plus-26c97eda5cb85b253706d49afff55580ace9e5bf.tar.xz
plus-26c97eda5cb85b253706d49afff55580ace9e5bf.zip
Use public text popup in emoteshortcutcontainer.
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp18
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h1
2 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 1e438f119..a1fee31a2 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -48,12 +48,9 @@ static const int MAX_ITEMS = 48;
EmoteShortcutContainer::EmoteShortcutContainer(Widget2 *const widget) :
ShortcutContainer(widget),
mEmoteImg(),
- mEmotePopup(new TextPopup),
mEmoteClicked(false),
mEmoteMoved(0)
{
- mEmotePopup->postInit();
-
if (mBackgroundImg)
mBackgroundImg->setAlpha(settings.guiAlpha);
@@ -70,7 +67,6 @@ EmoteShortcutContainer::EmoteShortcutContainer(Widget2 *const widget) :
EmoteShortcutContainer::~EmoteShortcutContainer()
{
- delete2(mEmotePopup);
}
void EmoteShortcutContainer::setWidget2(const Widget2 *const widget)
@@ -190,7 +186,7 @@ void EmoteShortcutContainer::mouseReleased(MouseEvent &event)
void EmoteShortcutContainer::mouseMoved(MouseEvent &event)
{
- if (!emoteShortcut || !mEmotePopup)
+ if (!emoteShortcut || !textPopup)
return;
const int index = getIndexFromGrid(event.getX(), event.getY());
@@ -198,24 +194,24 @@ void EmoteShortcutContainer::mouseMoved(MouseEvent &event)
if (index == -1)
return;
- mEmotePopup->setVisible(false);
+ textPopup->setVisible(false);
if (static_cast<size_t>(index) < mEmoteImg.size() && mEmoteImg[index])
{
const EmoteSprite *const sprite = mEmoteImg[index];
- mEmotePopup->show(viewport->getMouseX(), viewport->getMouseY(),
+ textPopup->show(viewport->getMouseX(), viewport->getMouseY(),
strprintf("%s, %d", sprite->name.c_str(), sprite->id));
}
}
void EmoteShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
{
- if (mEmotePopup)
- mEmotePopup->setVisible(false);
+ if (textPopup)
+ textPopup->setVisible(false);
}
void EmoteShortcutContainer::widgetHidden(const Event &event A_UNUSED)
{
- if (mEmotePopup)
- mEmotePopup->setVisible(false);
+ if (textPopup)
+ textPopup->setVisible(false);
}
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 017929545..8a2ea498e 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -81,7 +81,6 @@ class EmoteShortcutContainer final : public ShortcutContainer
private:
std::vector<const EmoteSprite*> mEmoteImg;
- TextPopup *mEmotePopup;
bool mEmoteClicked;
unsigned char mEmoteMoved;
};