aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2005-01-15 13:35:48 (GMT)
committerfluxgen <fluxgen>2005-01-15 13:35:48 (GMT)
commit78f3ca5db6d9779c9c8ea1c5fe1feef942eb7236 (patch)
treef37701ea895e6e792e16076bea6f022a38a8fab2 /src/FbTk/Menu.hh
parent996e30ef10f855d68799e4ad1a48639518783940 (diff)
downloadfluxbox-78f3ca5db6d9779c9c8ea1c5fe1feef942eb7236.zip
fluxbox-78f3ca5db6d9779c9c8ea1c5fe1feef942eb7236.tar.bz2
cleaning
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 423b80a..de10d0f 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -77,10 +77,10 @@ public:
77 int remove(unsigned int item); 77 int remove(unsigned int item);
78 /// remove all items 78 /// remove all items
79 void removeAll(); 79 void removeAll();
80 inline void setInternalMenu(bool val = true) { internal_menu = val; } 80 inline void setInternalMenu(bool val = true) { m_internal_menu = val; }
81 inline void setAlignment(Alignment a) { m_alignment = a; } 81 inline void setAlignment(Alignment a) { m_alignment = a; }
82 inline void setTorn() { torn = true; } 82 inline void setTorn() { m_torn = true; }
83 inline void removeParent() { if (internal_menu) m_parent = 0; } 83 inline void removeParent() { if (m_internal_menu) m_parent = 0; }
84 /// raise this window 84 /// raise this window
85 virtual void raise(); 85 virtual void raise();
86 /// lower this window 86 /// lower this window
@@ -135,8 +135,8 @@ public:
135 */ 135 */
136 //@{ 136 //@{
137 inline int activeIndex() const { return m_active_index; } 137 inline int activeIndex() const { return m_active_index; }
138 inline bool isTorn() const { return torn; } 138 inline bool isTorn() const { return m_torn; }
139 inline bool isVisible() const { return visible; } 139 inline bool isVisible() const { return m_visible; }
140 inline int screenNumber() const { return menu.window.screenNumber(); } 140 inline int screenNumber() const { return menu.window.screenNumber(); }
141 inline Window window() const { return menu.window.window(); } 141 inline Window window() const { return menu.window.window(); }
142 inline FbWindow &fbwindow() { return menu.window; } 142 inline FbWindow &fbwindow() { return menu.window; }
@@ -149,7 +149,7 @@ public:
149 inline unsigned int width() const { return menu.window.width(); } 149 inline unsigned int width() const { return menu.window.width(); }
150 inline unsigned int height() const { return menu.window.height(); } 150 inline unsigned int height() const { return menu.window.height(); }
151 inline unsigned int numberOfItems() const { return menuitems.size(); } 151 inline unsigned int numberOfItems() const { return menuitems.size(); }
152 inline int currentSubmenu() const { return which_sub; } 152 inline int currentSubmenu() const { return m_which_sub; }
153 bool hasSubmenu(unsigned int index) const; 153 bool hasSubmenu(unsigned int index) const;
154 bool isItemSelected(unsigned int index) const; 154 bool isItemSelected(unsigned int index) const;
155 bool isItemEnabled(unsigned int index) const; 155 bool isItemEnabled(unsigned int index) const;
@@ -170,7 +170,7 @@ public:
170protected: 170protected:
171 171
172 inline void setTitleVisibility(bool b) { 172 inline void setTitleVisibility(bool b) {
173 title_vis = b; m_need_update = true; 173 m_title_vis = b; m_need_update = true;
174 if (!b) 174 if (!b)
175 titleWindow().lower(); 175 titleWindow().lower();
176 else 176 else
@@ -204,14 +204,14 @@ private:
204 204
205 int m_screen_x, m_screen_y; 205 int m_screen_x, m_screen_y;
206 int m_screen_width, m_screen_height; 206 int m_screen_width, m_screen_height;
207 bool moving; ///< if we're moving/draging or not 207 bool m_moving; ///< if we're moving/draging or not
208 bool visible; ///< menu visibility 208 bool m_visible; ///< menu visibility
209 bool torn; ///< torn from parent 209 bool m_torn; ///< torn from parent
210 bool internal_menu; ///< whether we should destroy this menu or if it's managed somewhere else 210 bool m_internal_menu; ///< whether we should destroy this menu or if it's managed somewhere else
211 bool title_vis; ///< title visibility 211 bool m_title_vis; ///< title visibility
212 bool shifted; ///< if the menu is shifted to the other side of the parent 212 bool m_shifted; ///< if the menu is shifted to the other side of the parent
213 213
214 int which_sub, which_press, which_sbl; 214 int m_which_sub, m_which_press, m_which_sbl;
215 Alignment m_alignment; 215 Alignment m_alignment;
216 216
217 struct _menu { 217 struct _menu {