Added a runtime option for hiding the toolbar totally. Will be cleaner

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index bae8e1b6e203aec4cc25f6ca3a4751318099ad55..9f09eb76e8c5d07555e6e220d3499d53f070239f 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -59,6 +59,8 @@ Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr)
                          "Focus New Windows"), 4);
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusLast,
                          "Focus Last Window on Workspace"), 5);
+  insert(i18n->getMessage(ConfigmenuSet, ConfigmenuHideToolbar,
+                         "Hide toolbar"), 6);
   update();
 
   setItemSelected(2, screen.getImageControl()->doDither());
@@ -66,6 +68,7 @@ Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr)
   setItemSelected(4, screen.doFullMax());
   setItemSelected(5, screen.doFocusNew());
   setItemSelected(6, screen.doFocusLast());
+  setItemSelected(7, screen.doToolbarHide());
 }
 
 Configmenu::~Configmenu(void) {
@@ -115,10 +118,15 @@ void Configmenu::itemSelected(int button, int index) {
   }
 
   case 5: { // focus last window on workspace
-    screen.saveFocusLast((! screen.doFocusLast()));
+    screen.saveFocusLast(!(screen.doFocusLast()));
     setItemSelected(index, screen.doFocusLast());
     break;
   }
+  case 6:{ //toggle toolbar hide
+    screen.saveToolbarHide(!(screen.doToolbarHide()));
+    setItemSelected(index, screen.doToolbarHide());
+    break;
+  }
   } // switch
 }
 
@@ -164,13 +172,13 @@ void Configmenu::Focusmenu::itemSelected(int button, int index) {
     configmenu->screen.saveSloppyFocus(False);
     configmenu->screen.saveAutoRaise(False);
 
-    if (! configmenu->screen.getOpenbox()->getFocusedWindow())
-      XSetInputFocus(configmenu->screen.getOpenbox()->getXDisplay(),
+    if (! configmenu->screen.getOpenbox().getFocusedWindow())
+      XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
                     configmenu->screen.getToolbar()->getWindowID(),
                     RevertToParent, CurrentTime);
     else
-      XSetInputFocus(configmenu->screen.getOpenbox()->getXDisplay(),
-                    configmenu->screen.getOpenbox()->
+      XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
+                    configmenu->screen.getOpenbox().
                     getFocusedWindow()->getClientWindow(),
                     RevertToParent, CurrentTime);
 
@@ -205,7 +213,7 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) :
   setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuWindowPlacement,
                            "Window Placement"));
   setInternalMenu();
-
+  
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSmartRows,
                          "Smart Placement (Rows)"),
         BScreen::RowSmartPlacement);