Make Deskbar respect the menu text color settings.

Hard-coding black is bad, mmmkay?

This makes Deskbar usable on dark background with light text color schemes.
This commit is contained in:
Ryan Leavengood 2012-08-03 01:59:53 -04:00
parent ab4e79c351
commit e19488b2cc
3 changed files with 3 additions and 3 deletions

View File

@ -400,7 +400,7 @@ TTeamMenuItem::DrawContent()
// what we want // what we want
if (fDrawLabel) { if (fDrawLabel) {
menu->SetDrawingMode(B_OP_OVER); menu->SetDrawingMode(B_OP_OVER);
menu->SetHighColor(0, 0, 0); menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
// override the drawing of the content when the item is disabled // override the drawing of the content when the item is disabled
// the wrong lowcolor is used when the item is disabled since the // the wrong lowcolor is used when the item is disabled since the

View File

@ -159,7 +159,7 @@ TTimeView::Draw(BRect /*updateRect*/)
SetHighColor(ViewColor()); SetHighColor(ViewColor());
SetLowColor(ViewColor()); SetLowColor(ViewColor());
FillRect(Bounds()); FillRect(Bounds());
SetHighColor(0, 0, 0, 255); SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
DrawString(fCurrentTimeStr, fTimeLocation); DrawString(fCurrentTimeStr, fTimeLocation);

View File

@ -273,7 +273,7 @@ TWindowMenuItem::DrawContent()
menu->MovePenTo(contLoc); menu->MovePenTo(contLoc);
// Set the pen color so that the label is always visible. // Set the pen color so that the label is always visible.
menu->SetHighColor(0, 0, 0); menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
BMenuItem::DrawContent(); BMenuItem::DrawContent();