There is a B_CONTROL_TEXT_COLOR after all.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19134 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -427,7 +427,7 @@ BButton::Draw(BRect updateRect)
|
||||
255 - buttonBgColor.green,
|
||||
255 - buttonBgColor.blue);
|
||||
} else {
|
||||
SetHighColor(maxShadowColor);
|
||||
SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
|
||||
SetLowColor(buttonBgColor);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -221,7 +221,7 @@ BTab::DrawLabel(BView *owner, BRect frame)
|
||||
if (label == NULL)
|
||||
return;
|
||||
|
||||
owner->SetHighColor(0, 0, 0);
|
||||
owner->SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
|
||||
float width = owner->StringWidth(label);
|
||||
// TODO: remove offset
|
||||
float offset = frame.Height() / 2.0;
|
||||
@@ -668,10 +668,11 @@ BTabView::Draw(BRect updateRect)
|
||||
BRect
|
||||
BTabView::DrawTabs()
|
||||
{
|
||||
for (int32 i = 0; i < CountTabs(); i++)
|
||||
for (int32 i = 0; i < CountTabs(); i++) {
|
||||
TabAt(i)->DrawTab(this, TabFrame(i),
|
||||
i == fSelection ? B_TAB_FRONT : (i == 0) ? B_TAB_FIRST : B_TAB_ANY,
|
||||
i + 1 != fSelection);
|
||||
}
|
||||
|
||||
if (fSelection < CountTabs())
|
||||
return TabFrame(fSelection);
|
||||
|
||||
Reference in New Issue
Block a user