diff options
| author | Mathias Gumz <akira at fluxbox dot org> | 2011-02-25 17:39:48 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2011-02-25 17:39:48 (GMT) |
| commit | d2e7feaa855352986ff78cc9b2017bcebb78ea6c (patch) | |
| tree | 3c9f9a16bc39f5f0c7ea56f5f25eceb4730d4f94 /src/FbTk/Menu.cc | |
| parent | 798ecb88d57e5ed7af24be62a52e6f0ccb87a7de (diff) | |
| download | fluxbox-d2e7feaa855352986ff78cc9b2017bcebb78ea6c.zip fluxbox-d2e7feaa855352986ff78cc9b2017bcebb78ea6c.tar.bz2 | |
bugfix: submenus didn't hide if a delay was set
use the FbTk::Timer API correctly, bug(s) introduced by
1f0adef4daa2da5b08ed7f41e7a0ce1e3f71e46f
e68511794130388ab9668fdef0dcf48dbbf002fd
Diffstat (limited to 'src/FbTk/Menu.cc')
| -rw-r--r-- | src/FbTk/Menu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 6f997a5..a3b7793 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
| @@ -1002,7 +1002,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) { | |||
| 1002 | } | 1002 | } |
| 1003 | 1003 | ||
| 1004 | if (itmp->submenu()) { // start submenu open delay | 1004 | if (itmp->submenu()) { // start submenu open delay |
| 1005 | m_submenu_timer.setTimeout(0, theme()->getDelay() * 1000); | 1005 | m_submenu_timer.setTimeout(theme()->getDelay()); |
| 1006 | m_submenu_timer.start(); | 1006 | m_submenu_timer.start(); |
| 1007 | } else if (isItemSelectable(w)){ | 1007 | } else if (isItemSelectable(w)){ |
| 1008 | // else normal menu item | 1008 | // else normal menu item |
| @@ -1221,7 +1221,7 @@ void Menu::closeMenu() { | |||
| 1221 | } | 1221 | } |
| 1222 | 1222 | ||
| 1223 | void Menu::startHide() { | 1223 | void Menu::startHide() { |
| 1224 | m_hide_timer.setTimeout(theme()->getDelay() * 1000); | 1224 | m_hide_timer.setTimeout(theme()->getDelay()); |
| 1225 | m_hide_timer.start(); | 1225 | m_hide_timer.start(); |
| 1226 | } | 1226 | } |
| 1227 | 1227 | ||