make getting a list of strings work right

[chaz/openbox] / src / Toolbar.cc

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 447e0d033e9c621cff7a94d2bbed5f319ea40e52..9c7c2fafbbce319de7ee4099302446c87145f688 100644 (file)
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -528,15 +528,20 @@ void Toolbar::updateStrut(void) {
   // left and right are always 0
   strut.top = strut.bottom = 0;
 
+  // when hidden only one border is visible
+  unsigned int border_width = screen->getBorderWidth();
+  if (! do_auto_hide)
+    border_width *= 2;
+
   if (! screen->doHideToolbar()) {
     switch(placement) {
     case TopLeft:
     case TopCenter:
     case TopRight:
-      strut.top = getExposedHeight() + (screen->getBorderWidth() * 2);
+      strut.top = getExposedHeight() + border_width;
       break;
     default:
-      strut.bottom = getExposedHeight() + (screen->getBorderWidth() * 2);
+      strut.bottom = getExposedHeight() + border_width;
     }
   }
 
@@ -974,6 +979,7 @@ void Toolbar::keyPressEvent(XKeyEvent *ke) {
 
       Workspace *wkspc = screen->getCurrentWorkspace();
       wkspc->setName(new_workspace_name);
+      screen->updateDesktopNames();
       wkspc->getMenu()->hide();
 
       screen->getWorkspacemenu()->changeItemLabel(wkspc->getID() + 2,