change the color used for the checkmark. match the text. dont check the current workspace in the workspace menu.

2 files changed, 10 insertions, 4 deletions

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 9462abac..fcd6931e 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -607,6 +607,11 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
   
   if (dosel && item->isSelected()) {
+    // match the text color
+    BPen pen((highlight ? style->h_text :
+              (item->isEnabled() ? style->f_text :
+               style->d_text)));
+
       XPoint pts[6];
 
       pts[0].x = sel_x + 0;
@@ -621,13 +626,14 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
       pts[3].x = 5;
       pts[3].y = -5;
       
+      
       pts[4].x = 0;
       pts[4].y = -3;
       
       pts[5].x = -5;
       pts[5].y = 5;
 
-      XFillPolygon(display, menu.frame, pen.gc(), pts, 6, Complex,
+      XFillPolygon(display, menu.frame, pen.gc(), pts, 6, Nonconvex,
                    CoordModePrevious);
   }
 
diff --git a/src/Screen.cc b/src/Screen.cc
index e0ef585f..c1f8532f 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();