aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index c7be717..2b668fa 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Menu.hh,v 1.31 2004/04/18 18:48:58 fluxgen Exp $ 25// $Id: Menu.hh,v 1.32 2004/06/07 20:28:49 fluxgen Exp $
26 26
27#ifndef FBTK_MENU_HH 27#ifndef FBTK_MENU_HH
28#define FBTK_MENU_HH 28#define FBTK_MENU_HH
@@ -151,7 +151,7 @@ public:
151 bool isItemSelected(unsigned int index) const; 151 bool isItemSelected(unsigned int index) const;
152 bool isItemEnabled(unsigned int index) const; 152 bool isItemEnabled(unsigned int index) const;
153 inline const MenuTheme &theme() const { return m_theme; } 153 inline const MenuTheme &theme() const { return m_theme; }
154 inline unsigned char alpha() const { return m_theme.alpha(); } 154 inline unsigned char alpha() const { return theme().alpha(); }
155 inline static Menu *focused() { return s_focused; } 155 inline static Menu *focused() { return s_focused; }
156 /// @return menuitem at index 156 /// @return menuitem at index
157 inline const MenuItem *find(unsigned int index) const { return menuitems[index]; } 157 inline const MenuItem *find(unsigned int index) const { return menuitems[index]; }
@@ -174,7 +174,7 @@ protected:
174 inline Menu *parent() { return m_parent; } 174 inline Menu *parent() { return m_parent; }
175 inline const Menu *parent() const { return m_parent; } 175 inline const Menu *parent() const { return m_parent; }
176 176
177 void update(FbTk::Subject *) { reconfigure(); } 177 void update(FbTk::Subject *);
178 178
179private: 179private:
180 180
@@ -183,8 +183,8 @@ private:
183 void startHide(); 183 void startHide();
184 void stopHide(); 184 void stopHide();
185 185
186 void renderTransFrame(); 186 void renderTransp(int x, int y,
187 187 unsigned int width, unsigned int height);
188 typedef std::vector<MenuItem *> Menuitems; 188 typedef std::vector<MenuItem *> Menuitems;
189 const MenuTheme &m_theme; 189 const MenuTheme &m_theme;
190 Menu *m_parent; 190 Menu *m_parent;
@@ -211,7 +211,8 @@ private:
211 211
212 Drawable m_root_pm; 212 Drawable m_root_pm;
213 static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused 213 static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused
214 FbPixmap m_frame_pm; 214 FbPixmap m_frame_pm, m_real_frame_pm;
215 std::auto_ptr<Transparent> m_transp;
215 bool m_need_update; 216 bool m_need_update;
216 Timer m_submenu_timer; 217 Timer m_submenu_timer;
217 Timer m_hide_timer; 218 Timer m_hide_timer;