Fixed B_MENU_SELECTED_BACKGROUND_COLOR to fit to our B_MENU_BACKGROUND_COLOR,

and changed BMenuItem to actually use it.
This fixes bug #640.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17641 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-29 23:04:18 +00:00
parent 61119116a2
commit 7a04ba9b1d
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ static const rgb_color _kDefaultColors[kNumColors] = {
{255, 203, 0, 255}, // B_WINDOW_TAB_COLOR {255, 203, 0, 255}, // B_WINDOW_TAB_COLOR
{0, 0, 229, 255}, // B_KEYBOARD_NAVIGATION_COLOR {0, 0, 229, 255}, // B_KEYBOARD_NAVIGATION_COLOR
{51, 102, 152, 255}, // B_DESKTOP_COLOR {51, 102, 152, 255}, // B_DESKTOP_COLOR
{115, 120, 184, 255}, // B_MENU_SELECTED_BACKGROUND_COLOR {153, 153, 153, 255}, // B_MENU_SELECTED_BACKGROUND_COLOR
{0, 0, 0, 255}, // B_MENU_ITEM_TEXT_COLOR {0, 0, 0, 255}, // B_MENU_ITEM_TEXT_COLOR
{0, 0, 0, 255}, // B_MENU_SELECTED_ITEM_TEXT_COLOR {0, 0, 0, 255}, // B_MENU_SELECTED_ITEM_TEXT_COLOR
{0, 0, 0, 255}, // B_MENU_SELECTED_BORDER_COLOR {0, 0, 0, 255}, // B_MENU_SELECTED_BORDER_COLOR

View File

@ -465,7 +465,7 @@ BMenuItem::Draw()
// set low color and fill background if selected // set low color and fill background if selected
if (selected && (enabled || Submenu()) /*&& fSuper->fRedrawAfterSticky*/) { if (selected && (enabled || Submenu()) /*&& fSuper->fRedrawAfterSticky*/) {
bgColor = tint_color(noTint, B_DARKEN_2_TINT); bgColor = ui_color(B_MENU_SELECTED_BACKGROUND_COLOR);
fSuper->SetLowColor(bgColor); fSuper->SetLowColor(bgColor);
fSuper->FillRect(Frame(), B_SOLID_LOW); fSuper->FillRect(Frame(), B_SOLID_LOW);
} else } else