From aae7000d63b98f6acdc24715d2c9443501876a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 13 Feb 2006 00:55:00 +0000 Subject: [PATCH] The previous fix also didn't work correctly; we can't use the text color used in the BTextView as a base. Instead we're now using the correct UI default colors. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16374 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/TextControl.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp index d5eb5acea2..1dfc193409 100644 --- a/src/kits/interface/TextControl.cpp +++ b/src/kits/interface/TextControl.cpp @@ -581,13 +581,13 @@ void BTextControl::_UpdateTextViewColors(bool enabled) { rgb_color textColor; - rgb_color color = {0, 0, 0, 255}; + rgb_color color; BFont font; - fText->GetFontAndColor(0, &font, &color); + fText->GetFontAndColor(0, &font); if (enabled) - textColor = color; + textColor = ui_color(B_DOCUMENT_TEXT_COLOR); else { textColor = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_DISABLED_LABEL_TINT); @@ -596,9 +596,7 @@ BTextControl::_UpdateTextViewColors(bool enabled) fText->SetFontAndColor(&font, B_FONT_ALL, &textColor); if (enabled) { - color.red = 255; - color.green = 255; - color.blue = 255; + color = ui_color(B_DOCUMENT_BACKGROUND_COLOR); } else { color = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_2_TINT);