i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There is a B_CONTROL_TEXT_COLOR after all.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19134 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-10-28 15:46:36 +00:00
parent 1868b512e3
commit 0a5c585a92
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Button.cpp
+1 -1
View File
@@ -427,7 +427,7 @@ BButton::Draw(BRect updateRect)
255 - buttonBgColor.green, 255 - buttonBgColor.green,
255 - buttonBgColor.blue); 255 - buttonBgColor.blue);
} else { } else {
SetHighColor(maxShadowColor); SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
SetLowColor(buttonBgColor); SetLowColor(buttonBgColor);
} }
} else { } else {
src/kits/interface/TabView.cpp
+3 -2
View File
@@ -221,7 +221,7 @@ BTab::DrawLabel(BView *owner, BRect frame)
if (label == NULL) if (label == NULL)
return; return;
owner->SetHighColor(0, 0, 0); owner->SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
float width = owner->StringWidth(label); float width = owner->StringWidth(label);
// TODO: remove offset // TODO: remove offset
float offset = frame.Height() / 2.0; float offset = frame.Height() / 2.0;
@@ -668,10 +668,11 @@ BTabView::Draw(BRect updateRect)
BRect BRect
BTabView::DrawTabs() BTabView::DrawTabs()
{ {
for (int32 i = 0; i < CountTabs(); i++) for (int32 i = 0; i < CountTabs(); i++) {
TabAt(i)->DrawTab(this, TabFrame(i), TabAt(i)->DrawTab(this, TabFrame(i),
i == fSelection ? B_TAB_FRONT : (i == 0) ? B_TAB_FIRST : B_TAB_ANY, i == fSelection ? B_TAB_FRONT : (i == 0) ? B_TAB_FIRST : B_TAB_ANY,
i + 1 != fSelection); i + 1 != fSelection);
}
if (fSelection < CountTabs()) if (fSelection < CountTabs())
return TabFrame(fSelection); return TabFrame(fSelection);