Update Deskbar to use menu text and selected menu text color prefs.
... in a couple of places where colors where being hardcoded. Fixes #9119
This commit is contained in:
@@ -133,7 +133,6 @@ TBarMenuTitle::DrawContent()
|
|||||||
rgb_color menuColor = menu->LowColor();
|
rgb_color menuColor = menu->LowColor();
|
||||||
rgb_color dark = tint_color(menuColor, B_DARKEN_1_TINT);
|
rgb_color dark = tint_color(menuColor, B_DARKEN_1_TINT);
|
||||||
rgb_color light = tint_color(menuColor, B_LIGHTEN_2_TINT);
|
rgb_color light = tint_color(menuColor, B_LIGHTEN_2_TINT);
|
||||||
rgb_color black = {0, 0, 0, 255};
|
|
||||||
|
|
||||||
bool inExpandoMode = dynamic_cast<TExpandoMenuBar*>(menu) != NULL;
|
bool inExpandoMode = dynamic_cast<TExpandoMenuBar*>(menu) != NULL;
|
||||||
|
|
||||||
@@ -161,7 +160,10 @@ TBarMenuTitle::DrawContent()
|
|||||||
frame.InsetBy(1, 1);
|
frame.InsetBy(1, 1);
|
||||||
menu->SetHighColor(menuColor);
|
menu->SetHighColor(menuColor);
|
||||||
menu->FillRect(frame);
|
menu->FillRect(frame);
|
||||||
menu->SetHighColor(black);
|
if (IsSelected())
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR));
|
||||||
|
else
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
||||||
frame.InsetBy(-1, -1);
|
frame.InsetBy(-1, -1);
|
||||||
if (inExpandoMode)
|
if (inExpandoMode)
|
||||||
frame.top -= 1;
|
frame.top -= 1;
|
||||||
@@ -177,7 +179,10 @@ TBarMenuTitle::DrawContent()
|
|||||||
menu->StrokeLine(frame.LeftTop(), frame.LeftBottom());
|
menu->StrokeLine(frame.LeftTop(), frame.LeftBottom());
|
||||||
}
|
}
|
||||||
|
|
||||||
menu->SetHighColor(black);
|
if (IsSelected())
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR));
|
||||||
|
else
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
||||||
}
|
}
|
||||||
|
|
||||||
menu->SetDrawingMode(B_OP_ALPHA);
|
menu->SetDrawingMode(B_OP_ALPHA);
|
||||||
|
|||||||
@@ -395,9 +395,6 @@ TTeamMenuItem::DrawContent()
|
|||||||
menu->MovePenTo(drawLoc);
|
menu->MovePenTo(drawLoc);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set the pen to black so that either method will draw in the same color
|
|
||||||
// low color is set in inherited::DrawContent, override makes sure its
|
|
||||||
// what we want
|
|
||||||
if (fDrawLabel) {
|
if (fDrawLabel) {
|
||||||
menu->SetDrawingMode(B_OP_OVER);
|
menu->SetDrawingMode(B_OP_OVER);
|
||||||
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
||||||
@@ -513,6 +510,11 @@ TTeamMenuItem::DrawContentLabel()
|
|||||||
else
|
else
|
||||||
menu->SetLowColor(menu->LowColor());
|
menu->SetLowColor(menu->LowColor());
|
||||||
|
|
||||||
|
if (IsSelected())
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR));
|
||||||
|
else
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
||||||
|
|
||||||
menu->DrawString(label);
|
menu->DrawString(label);
|
||||||
|
|
||||||
free(truncLabel);
|
free(truncLabel);
|
||||||
|
|||||||
@@ -272,8 +272,11 @@ TWindowMenuItem::DrawContent()
|
|||||||
+ ((frame.Height() - fTitleAscent - fTitleDescent) / 2) + 1.0f;
|
+ ((frame.Height() - fTitleAscent - fTitleDescent) / 2) + 1.0f;
|
||||||
|
|
||||||
menu->MovePenTo(contLoc);
|
menu->MovePenTo(contLoc);
|
||||||
// Set the pen color so that the label is always visible.
|
|
||||||
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
if (IsSelected())
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR));
|
||||||
|
else
|
||||||
|
menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
|
||||||
|
|
||||||
BMenuItem::DrawContent();
|
BMenuItem::DrawContent();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user