aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-10-13 04:55:03 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-10-13 04:55:03 (GMT)
commit5b07791ed4c33a11f8fabd274b07056e4fa6996d (patch)
tree5b62f4b779aab02f5115d15c5682977ccab4b99a /src/FbTk/Menu.cc
parente5fd401f4eadef1aa4ab91b11d38653d1a4b7194 (diff)
downloadfluxbox-5b07791ed4c33a11f8fabd274b07056e4fa6996d.zip
fluxbox-5b07791ed4c33a11f8fabd274b07056e4fa6996d.tar.bz2
merge menuDelay and menuDelayClose options
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r--src/FbTk/Menu.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index a61bbc7..7cf2ac9 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -998,7 +998,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
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;
1001 timeout.tv_usec = theme()->delayOpen() * 1000; // transformed to usec 1001 timeout.tv_usec = theme()->getDelay() * 1000; // transformed to usec
1002 m_submenu_timer.setTimeout(timeout); 1002 m_submenu_timer.setTimeout(timeout);
1003 m_submenu_timer.start(); 1003 m_submenu_timer.start();
1004 } else if (isItemSelectable(w)){ 1004 } else if (isItemSelectable(w)){
@@ -1191,7 +1191,7 @@ void Menu::closeMenu() {
1191void Menu::startHide() { 1191void Menu::startHide() {
1192 timeval timeout; 1192 timeval timeout;
1193 timeout.tv_sec = 0; 1193 timeout.tv_sec = 0;
1194 timeout.tv_usec = theme()->delayClose() * 1000; // transformed to usec 1194 timeout.tv_usec = theme()->getDelay() * 1000; // transformed to usec
1195 m_hide_timer.setTimeout(timeout); 1195 m_hide_timer.setTimeout(timeout);
1196 m_hide_timer.start(); 1196 m_hide_timer.start();
1197} 1197}