aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 32925de..2694a4c 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -556,7 +556,9 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
556 556
557} 557}
558 558
559void Toolbar::enterNotifyEvent(XCrossingEvent &not_used) { 559void Toolbar::enterNotifyEvent(XCrossingEvent &ce) {
560 Fluxbox::instance()->keys()->doAction(ce.type, ce.state, 0,
561 Keys::ON_TOOLBAR);
560 if (! doAutoHide()) { 562 if (! doAutoHide()) {
561 if (isHidden()) 563 if (isHidden())
562 toggleHidden(); 564 toggleHidden();
@@ -573,13 +575,16 @@ void Toolbar::enterNotifyEvent(XCrossingEvent &not_used) {
573} 575}
574 576
575void Toolbar::leaveNotifyEvent(XCrossingEvent &event) { 577void Toolbar::leaveNotifyEvent(XCrossingEvent &event) {
576 if (! doAutoHide())
577 return;
578 // still inside? 578 // still inside?
579 if (event.x_root > x() && event.x_root <= (int)(x() + width()) && 579 if (event.x_root > x() && event.x_root <= (int)(x() + width()) &&
580 event.y_root > y() && event.y_root <= (int)(y() + height())) 580 event.y_root > y() && event.y_root <= (int)(y() + height()))
581 return; 581 return;
582 582
583 Fluxbox::instance()->keys()->doAction(event.type, event.state, 0,
584 Keys::ON_TOOLBAR);
585 if (! doAutoHide())
586 return;
587
583 if (isHidden()) { 588 if (isHidden()) {
584 if (m_hide_timer.isTiming()) 589 if (m_hide_timer.isTiming())
585 m_hide_timer.stop(); 590 m_hide_timer.stop();