aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-02-25 17:39:48 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-02-25 17:39:48 (GMT)
commitd2e7feaa855352986ff78cc9b2017bcebb78ea6c (patch)
tree3c9f9a16bc39f5f0c7ea56f5f25eceb4730d4f94 /src
parent798ecb88d57e5ed7af24be62a52e6f0ccb87a7de (diff)
downloadfluxbox_paul-d2e7feaa855352986ff78cc9b2017bcebb78ea6c.zip
fluxbox_paul-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')
-rw-r--r--src/AttentionNoticeHandler.cc2
-rw-r--r--src/FbTk/Menu.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/AttentionNoticeHandler.cc b/src/AttentionNoticeHandler.cc
index 9425bb2..88dd72a 100644
--- a/src/AttentionNoticeHandler.cc
+++ b/src/AttentionNoticeHandler.cc
@@ -82,7 +82,7 @@ void AttentionNoticeHandler::addAttention(Focusable &client) {
82 RefCount<Command<void> > cmd(new ToggleFrameFocusCmd(client)); 82 RefCount<Command<void> > cmd(new ToggleFrameFocusCmd(client));
83 Timer *timer = new Timer(); 83 Timer *timer = new Timer();
84 timer->setCommand(cmd); 84 timer->setCommand(cmd);
85 timer->setTimeout(0, **timeout_res * 1000); 85 timer->setTimeout(**timeout_res);
86 timer->fireOnce(false); // will repeat until window has focus 86 timer->fireOnce(false); // will repeat until window has focus
87 timer->start(); 87 timer->start();
88 88
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
1223void Menu::startHide() { 1223void 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