move the checkmarks to the opposite side of the bullets. This means they still can be used in the workspace menu for the focused workspace.

2 files changed, 11 insertions, 4 deletions

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index fcd6931e..228c43c7 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -614,7 +614,14 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
 
       XPoint pts[6];
 
-      pts[0].x = sel_x + 0;
+      // put the check mark on the opposite side of the menu
+      int x = sel_x;
+      if (screen->getMenuStyle()->bullet_pos == Right)
+        x -= (menu.item_w - menu.item_h - menu.bevel_w);
+      else
+        x += (menu.item_w - menu.item_h - menu.bevel_w);
+
+      pts[0].x = x + 0;
       pts[0].y = sel_y + 2;
       
       pts[1].x = 0;
diff --git a/src/Screen.cc b/src/Screen.cc
index c1f8532f..e0ef585f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -231,7 +231,7 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
   xatom->setValue(getRootWindow(), XAtom::net_current_desktop,
                   XAtom::cardinal, 0); //first workspace
 
-  //workspacemenu->setItemSelected(2, True);
+  workspacemenu->setItemSelected(2, True);
 
   toolbar = new Toolbar(this);
 
@@ -1063,14 +1063,14 @@ void BScreen::changeWorkspaceID(unsigned int id) {
   blackbox->setFocusedWindow((BlackboxWindow *) 0);
     
   current_workspace->hideAll();
-  //workspacemenu->setItemSelected(current_workspace->getID() + 2, False);
+  workspacemenu->setItemSelected(current_workspace->getID() + 2, False);
 
   current_workspace = getWorkspace(id);
 
   xatom->setValue(getRootWindow(), XAtom::net_current_desktop,
                   XAtom::cardinal, id);
 
-  //workspacemenu->setItemSelected(current_workspace->getID() + 2, True);
+  workspacemenu->setItemSelected(current_workspace->getID() + 2, True);
   toolbar->redrawWorkspaceLabel(True);
 
   current_workspace->showAll();