diff options
author | markt <markt> | 2007-11-22 20:21:47 (GMT) |
---|---|---|
committer | markt <markt> | 2007-11-22 20:21:47 (GMT) |
commit | bb6906fa80c06fc23975d7520b3e8919423a29b4 (patch) | |
tree | 214427a1221e350ce62e08e0656678d260ccf10f /src/Toolbar.cc | |
parent | 58cd017db04b83d0cb3b24882d1ba7471ec4d6e1 (diff) | |
download | fluxbox-bb6906fa80c06fc23975d7520b3e8919423a29b4.zip fluxbox-bb6906fa80c06fc23975d7520b3e8919423a29b4.tar.bz2 |
added special FocusIn/Out MouseOver/Out ChangeWorkspace keys
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 11 |
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 | ||
559 | void Toolbar::enterNotifyEvent(XCrossingEvent ¬_used) { | 559 | void 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 ¬_used) { | |||
573 | } | 575 | } |
574 | 576 | ||
575 | void Toolbar::leaveNotifyEvent(XCrossingEvent &event) { | 577 | void 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(); |