add autoraising to toolbar and slit

1 files changed, 12 insertions, 0 deletions

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index cb52066..23a8244 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -194,6 +194,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::Layer &layer, size_t width):
     // lock rcmanager here
     m_rc_auto_hide(scrn.resourceManager().lock(), false,
                    scrn.name() + ".toolbar.autoHide", scrn.altName() + ".Toolbar.AutoHide"),
+    m_rc_auto_raise(scrn.resourceManager().lock(), false,
+                   scrn.name() + ".toolbar.autoRaise", scrn.altName() + ".Toolbar.AutoRaise"),
     m_rc_maximize_over(scrn.resourceManager(), false,
                        scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"),
     m_rc_visible(scrn.resourceManager(), true, scrn.name() + ".toolbar.visible", scrn.altName() + ".Toolbar.Visible"),
@@ -522,6 +524,9 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
 }
 
 void Toolbar::enterNotifyEvent(XCrossingEvent &ce) {
+    if (m_rc_auto_raise)
+        m_layeritem.moveToLayer(ResourceLayer::ABOVE_DOCK);
+
     Fluxbox::instance()->keys()->doAction(ce.type, ce.state, 0,
                                           Keys::ON_TOOLBAR);
 
@@ -552,6 +557,9 @@ void Toolbar::leaveNotifyEvent(XCrossingEvent &event) {
         return;
     }
 
+    if (m_rc_auto_raise)
+        m_layeritem.moveToLayer(m_rc_layernum->getNum());
+
     Fluxbox::instance()->keys()->doAction(event.type, event.state, 0,
                                           Keys::ON_TOOLBAR);
 
@@ -762,6 +770,10 @@ void Toolbar::setupMenus(bool skip_new_placement) {
                                              "Auto hide", "Toggle auto hide of toolbar"),
                                    m_rc_auto_hide,
                                    reconfig_toolbar_and_save_resource));
+    menu().insertItem(new FbTk::BoolMenuItem(_FB_XTEXT(Common, AutoRaise,
+                                             "Auto raise", "Toggle auto raise of toolbar"),
+                                   m_rc_auto_raise,
+                                   reconfig_toolbar_and_save_resource));
 
     MenuItem *toolbar_menuitem =
         new FbTk::IntMenuItem(_FB_XTEXT(Toolbar, WidthPercent,