Merge branch 'master' into to_push

1 files changed, 6 insertions, 1 deletions

diff --git a/src/IconButton.hh b/src/IconButton.hh
index b80a29b..2a81c85 100644
--- a/src/IconButton.hh
+++ b/src/IconButton.hh
@@ -45,6 +45,8 @@ public:
     virtual ~IconButton();
 
     void exposeEvent(XExposeEvent &event);
+    void enterNotifyEvent(XCrossingEvent &ce);
+    void leaveNotifyEvent(XCrossingEvent &ce);
     void clear();
     void clearArea(int x, int y,
                    unsigned int width, unsigned int height,
@@ -67,13 +69,16 @@ protected:
     void drawText(int x, int y, FbTk::FbDrawable *drawable_override);
 private:
     void setupWindow();
+    void showTooltip();
 
     Focusable &m_win;
     FbTk::FbWindow m_icon_window;
     FbTk::FbPixmap m_icon_pixmap;
     FbTk::FbPixmap m_icon_mask;
     bool m_use_pixmap;
-
+    /// whether or not this instance has the tooltip attention 
+    /// i.e if it got enter notify
+    bool m_has_tooltip;
     FocusableTheme<IconbarTheme> m_theme;
     // cached pixmaps
     FbTk::CachedPixmap m_pm;