From 90239e2bfa0fe28fa55b3c31a6c18ca7939291f7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 18 Jul 2002 06:47:26 +0000 Subject: [PATCH] make the bullet, checkmark, and text, all the same color in the menu --- src/Basemenu.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 -- 2.45.2