X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=57c10fcb65223defa2e2615fc55418b538247e95;hb=6b3f5abde4139d044312d5a3ab53c63e1acf371b;hp=228c43c7158cfdb3c930e9bc999a06e79c703a64;hpb=5b0751d51efddc14176734ab6740ecf9400dbaa8;p=chaz%2Fopenbox diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 228c43c7..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,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