From c432fbbbb796cec5100f8738a336e1310f507da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 15 Feb 2006 12:40:34 +0000 Subject: [PATCH] Now uses B_CONTROL_TEXT_COLOR to draw the label instead of just black. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16404 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/TextControl.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp index 1dfc193409..39ff125bb2 100644 --- a/src/kits/interface/TextControl.cpp +++ b/src/kits/interface/TextControl.cpp @@ -175,12 +175,12 @@ BTextControl::SetAlignment(alignment labelAlignment, alignment textAlignment) void -BTextControl::GetAlignment(alignment *label, alignment *text) const +BTextControl::GetAlignment(alignment* _label, alignment* _text) const { - if (label) - *label = fLabelAlign; - if (text) - *text = fText->Alignment(); + if (_label) + *_label = fLabelAlign; + if (_text) + *_text = fText->Alignment(); } @@ -213,15 +213,14 @@ BTextControl::Divider() const void BTextControl::Draw(BRect updateRect) { - rgb_color noTint = ui_color(B_PANEL_BACKGROUND_COLOR), - lighten1 = tint_color(noTint, B_LIGHTEN_1_TINT), - lighten2 = tint_color(noTint, B_LIGHTEN_2_TINT), - lightenMax = tint_color(noTint, B_LIGHTEN_MAX_TINT), - darken1 = tint_color(noTint, B_DARKEN_1_TINT), - darken2 = tint_color(noTint, B_DARKEN_2_TINT), - darken4 = tint_color(noTint, B_DARKEN_4_TINT), - darkenMax = tint_color(noTint, B_DARKEN_MAX_TINT), - navigationColor = ui_color(B_KEYBOARD_NAVIGATION_COLOR); + rgb_color noTint = ui_color(B_PANEL_BACKGROUND_COLOR); + rgb_color lighten1 = tint_color(noTint, B_LIGHTEN_1_TINT); + rgb_color lighten2 = tint_color(noTint, B_LIGHTEN_2_TINT); + rgb_color lightenMax = tint_color(noTint, B_LIGHTEN_MAX_TINT); + rgb_color darken1 = tint_color(noTint, B_DARKEN_1_TINT); + rgb_color darken2 = tint_color(noTint, B_DARKEN_2_TINT); + rgb_color darken4 = tint_color(noTint, B_DARKEN_4_TINT); + rgb_color navigationColor = ui_color(B_KEYBOARD_NAVIGATION_COLOR); bool enabled = IsEnabled(); bool active = false; @@ -302,7 +301,7 @@ BTextControl::Draw(BRect updateRect) break; } - SetHighColor(IsEnabled() ? darkenMax + SetHighColor(IsEnabled() ? ui_color(B_CONTROL_TEXT_COLOR) : tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_DISABLED_LABEL_TINT)); DrawString(Label(), BPoint(x, y)); }