diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /src/IconButton.hh | |
parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
download | fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2 |
Merge branch 'master' into to_push
Diffstat (limited to 'src/IconButton.hh')
-rw-r--r-- | src/IconButton.hh | 7 |
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: | |||
45 | virtual ~IconButton(); | 45 | virtual ~IconButton(); |
46 | 46 | ||
47 | void exposeEvent(XExposeEvent &event); | 47 | void exposeEvent(XExposeEvent &event); |
48 | void enterNotifyEvent(XCrossingEvent &ce); | ||
49 | void leaveNotifyEvent(XCrossingEvent &ce); | ||
48 | void clear(); | 50 | void clear(); |
49 | void clearArea(int x, int y, | 51 | void clearArea(int x, int y, |
50 | unsigned int width, unsigned int height, | 52 | unsigned int width, unsigned int height, |
@@ -67,13 +69,16 @@ protected: | |||
67 | void drawText(int x, int y, FbTk::FbDrawable *drawable_override); | 69 | void drawText(int x, int y, FbTk::FbDrawable *drawable_override); |
68 | private: | 70 | private: |
69 | void setupWindow(); | 71 | void setupWindow(); |
72 | void showTooltip(); | ||
70 | 73 | ||
71 | Focusable &m_win; | 74 | Focusable &m_win; |
72 | FbTk::FbWindow m_icon_window; | 75 | FbTk::FbWindow m_icon_window; |
73 | FbTk::FbPixmap m_icon_pixmap; | 76 | FbTk::FbPixmap m_icon_pixmap; |
74 | FbTk::FbPixmap m_icon_mask; | 77 | FbTk::FbPixmap m_icon_mask; |
75 | bool m_use_pixmap; | 78 | bool m_use_pixmap; |
76 | 79 | /// whether or not this instance has the tooltip attention | |
80 | /// i.e if it got enter notify | ||
81 | bool m_has_tooltip; | ||
77 | FocusableTheme<IconbarTheme> m_theme; | 82 | FocusableTheme<IconbarTheme> m_theme; |
78 | // cached pixmaps | 83 | // cached pixmaps |
79 | FbTk::CachedPixmap m_pm; | 84 | FbTk::CachedPixmap m_pm; |