X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=57c10fcb65223defa2e2615fc55418b538247e95;hb=5cb2020b9b9cd146d7a5dffa47b44110d8d963ff;hp=fcd6931e6eba5dff03dbd4012468d59f131b2b3a;hpb=0a9da781402101b450b575c9ce0b20e651aa27a3;p=chaz%2Fopenbox

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index fcd6931e..57c10fcb 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -557,8 +557,11 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
 
   MenuStyle *style = screen->getMenuStyle();
-  BPen pen((highlight || item->isSelected()) ? style->h_text : style->f_text),
-      hipen(style->hilite.color());
+  BPen hipen(style->hilite.color());
+  // match the text color
+  BPen pen((highlight ? style->h_text :
+            (item->isEnabled() ? style->f_text :
+             style->d_text)));
 
 
   sel_x = item_x;
@@ -607,14 +610,16 @@ 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;
+      // 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;