summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-18 11:24:43 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-18 11:25:55 +0300
commit997a8cd0794f208d4c148588f42695f2a5d0b3a8 (patch)
tree7a675f212be578675ddb480fc6cd9f9bb2a2caeb
parenta2adcb49e33928694c6b7c6b412895f8d45bbef9 (diff)
downloadmanaplus-997a8cd0794f208d4c148588f42695f2a5d0b3a8.tar.gz
manaplus-997a8cd0794f208d4c148588f42695f2a5d0b3a8.tar.bz2
manaplus-997a8cd0794f208d4c148588f42695f2a5d0b3a8.tar.xz
manaplus-997a8cd0794f208d4c148588f42695f2a5d0b3a8.zip
Add tooltips to checkbox.
-rw-r--r--src/gui/widgets/checkbox.cpp5
-rw-r--r--src/gui/widgets/checkbox.h4
-rw-r--r--src/listeners/tooltiplistener.h4
3 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 15ad7e3ec..96231fd4b 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -89,7 +89,7 @@ CheckBox::CheckBox(const Widget2 *const widget,
ActionListener *const listener,
const std::string &restrict eventId) :
Widget(widget),
- MouseListener(),
+ ToolTipListener(),
KeyListener(),
mSelected(selected),
mCaption(),
@@ -233,9 +233,10 @@ void CheckBox::mouseEntered(MouseEvent& event A_UNUSED)
mHasMouse = true;
}
-void CheckBox::mouseExited(MouseEvent& event A_UNUSED)
+void CheckBox::mouseExited(MouseEvent& event)
{
mHasMouse = false;
+ ToolTipListener::mouseExited(event);
}
void CheckBox::keyPressed(KeyEvent& event)
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 41f168048..03872a154 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -67,7 +67,7 @@
#define GUI_WIDGETS_CHECKBOX_H
#include "listeners/keylistener.h"
-#include "listeners/mouselistener.h"
+#include "listeners/tooltiplistener.h"
#include "gui/widgets/widget.h"
@@ -81,7 +81,7 @@ class Skin;
* \ingroup GUI
*/
class CheckBox final : public Widget,
- public MouseListener,
+ public ToolTipListener,
public KeyListener
{
public:
diff --git a/src/listeners/tooltiplistener.h b/src/listeners/tooltiplistener.h
index 73705ea67..6b034b976 100644
--- a/src/listeners/tooltiplistener.h
+++ b/src/listeners/tooltiplistener.h
@@ -40,9 +40,9 @@ class ToolTipListener notfinal : public MouseListener
std::string getToolTip() const
{ return mToolTip; }
- void mouseMoved(MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override;
- void mouseExited(MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override;
protected:
std::string mToolTip;