diff options
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Menu.cc | 2 | ||||
-rw-r--r-- | src/FbTk/MenuTheme.cc | 1 | ||||
-rw-r--r-- | src/FbTk/MenuTheme.hh | 8 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 7cb5599..a61bbc7 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -994,7 +994,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) { | |||
994 | 994 | ||
995 | } | 995 | } |
996 | 996 | ||
997 | if (itmp->submenu() && theme()->menuMode() == MenuTheme::DELAY_OPEN) { | 997 | if (itmp->submenu()) { |
998 | // start submenu open delay | 998 | // start submenu open delay |
999 | timeval timeout; | 999 | timeval timeout; |
1000 | timeout.tv_sec = 0; | 1000 | timeout.tv_sec = 0; |
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc index 12aee4d..b6e8f93 100644 --- a/src/FbTk/MenuTheme.cc +++ b/src/FbTk/MenuTheme.cc | |||
@@ -72,7 +72,6 @@ MenuTheme::MenuTheme(int screen_num): | |||
72 | d_text_gc(RootWindow(m_display, screen_num)), | 72 | d_text_gc(RootWindow(m_display, screen_num)), |
73 | hilite_gc(RootWindow(m_display, screen_num)), | 73 | hilite_gc(RootWindow(m_display, screen_num)), |
74 | m_alpha(255), | 74 | m_alpha(255), |
75 | m_menumode(DELAY_OPEN), | ||
76 | m_delayopen(0), // no delay as default | 75 | m_delayopen(0), // no delay as default |
77 | m_delayclose(0), // no delay as default | 76 | m_delayclose(0), // no delay as default |
78 | m_real_title_height(*m_title_height), | 77 | m_real_title_height(*m_title_height), |
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index 70fc9b8..59fcbaf 100644 --- a/src/FbTk/MenuTheme.hh +++ b/src/FbTk/MenuTheme.hh | |||
@@ -34,11 +34,6 @@ namespace FbTk { | |||
34 | 34 | ||
35 | class MenuTheme: public Theme, public ThemeProxy<MenuTheme> { | 35 | class MenuTheme: public Theme, public ThemeProxy<MenuTheme> { |
36 | public: | 36 | public: |
37 | //!! TODO | ||
38 | // this isn't actually used with a theme item | ||
39 | // see setMenuMode() for more info | ||
40 | enum MenuMode {CLICK_OPEN, DELAY_OPEN}; | ||
41 | |||
42 | enum BulletType { EMPTY, SQUARE, TRIANGLE, DIAMOND}; | 37 | enum BulletType { EMPTY, SQUARE, TRIANGLE, DIAMOND}; |
43 | MenuTheme(int screen_num); | 38 | MenuTheme(int screen_num); |
44 | virtual ~MenuTheme(); | 39 | virtual ~MenuTheme(); |
@@ -116,8 +111,6 @@ public: | |||
116 | // this isn't actually a theme item | 111 | // this isn't actually a theme item |
117 | // 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 |
118 | // get resources into menu | 113 | // get resources into menu |
119 | void setMenuMode(MenuMode mode) { m_menumode = mode; } | ||
120 | MenuMode menuMode() const { return m_menumode; } | ||
121 | void setDelayOpen(int msec) { m_delayopen = msec; } | 114 | void setDelayOpen(int msec) { m_delayopen = msec; } |
122 | void setDelayClose(int msec) { m_delayclose = msec; } | 115 | void setDelayClose(int msec) { m_delayclose = msec; } |
123 | int delayOpen() const { return m_delayopen; } | 116 | int delayOpen() const { return m_delayopen; } |
@@ -164,7 +157,6 @@ private: | |||
164 | GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc; | 157 | GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc; |
165 | 158 | ||
166 | unsigned char m_alpha; | 159 | unsigned char m_alpha; |
167 | MenuMode m_menumode; | ||
168 | unsigned int m_delayopen; ///< in msec | 160 | unsigned int m_delayopen; ///< in msec |
169 | unsigned int m_delayclose; ///< in msec | 161 | unsigned int m_delayclose; ///< in msec |
170 | unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) | 162 | unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) |