dont reconfigure during startup. thats a waste and screws up stuff!

[chaz/openbox] / src / Basemenu.cc

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 228c43c7158cfdb3c930e9bc999a06e79c703a64..57c10fcb65223defa2e2615fc55418b538247e95 100644 (file)
--- 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,11 +610,6 @@ 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];
 
       // put the check mark on the opposite side of the menu