diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-10-13 04:55:03 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-10-13 04:55:03 (GMT) |
commit | 5b07791ed4c33a11f8fabd274b07056e4fa6996d (patch) | |
tree | 5b62f4b779aab02f5115d15c5682977ccab4b99a /src/FbTk/MenuTheme.hh | |
parent | e5fd401f4eadef1aa4ab91b11d38653d1a4b7194 (diff) | |
download | fluxbox-5b07791ed4c33a11f8fabd274b07056e4fa6996d.zip fluxbox-5b07791ed4c33a11f8fabd274b07056e4fa6996d.tar.bz2 |
merge menuDelay and menuDelayClose options
Diffstat (limited to 'src/FbTk/MenuTheme.hh')
-rw-r--r-- | src/FbTk/MenuTheme.hh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index 59fcbaf..c10615b 100644 --- a/src/FbTk/MenuTheme.hh +++ b/src/FbTk/MenuTheme.hh | |||
@@ -111,10 +111,8 @@ public: | |||
111 | // this isn't actually a theme item | 111 | // this isn't actually a theme item |
112 | // but we'll let it be here for now, until there's a better way to | 112 | // but we'll let it be here for now, until there's a better way to |
113 | // get resources into menu | 113 | // get resources into menu |
114 | void setDelayOpen(int msec) { m_delayopen = msec; } | 114 | void setDelay(int msec) { m_delay = msec; } |
115 | void setDelayClose(int msec) { m_delayclose = msec; } | 115 | int getDelay() const { return m_delay; } |
116 | int delayOpen() const { return m_delayopen; } | ||
117 | int delayClose() const { return m_delayclose; } | ||
118 | 116 | ||
119 | const Color &borderColor() const { return *m_border_color; } | 117 | const Color &borderColor() const { return *m_border_color; } |
120 | Shape::ShapePlace shapePlaces() const { return *m_shapeplace; } | 118 | Shape::ShapePlace shapePlaces() const { return *m_shapeplace; } |
@@ -157,8 +155,7 @@ private: | |||
157 | GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc; | 155 | GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc; |
158 | 156 | ||
159 | unsigned char m_alpha; | 157 | unsigned char m_alpha; |
160 | unsigned int m_delayopen; ///< in msec | 158 | unsigned int m_delay; ///< in msec |
161 | unsigned int m_delayclose; ///< in msec | ||
162 | unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) | 159 | unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) |
163 | unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) | 160 | unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) |
164 | }; | 161 | }; |