From 49a3ee2a3b038f3bc850c36610c696cb99d4b4f3 Mon Sep 17 00:00:00 2001 From: Janus Date: Thu, 4 Oct 2018 10:15:45 +0200 Subject: [PATCH] WebPositive: uses system colors for url text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixes #14518 Change-Id: I76f33694d318e93c096ecab24a9b0316eacda68e Reviewed-on: https://review.haiku-os.org/613 Reviewed-by: Jérôme Duval Reviewed-by: Skipp_OSX Reviewed-by: waddlesplash --- src/apps/webpositive/URLInputGroup.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/apps/webpositive/URLInputGroup.cpp b/src/apps/webpositive/URLInputGroup.cpp index 9a0437e9ae..d4fff1af8b 100644 --- a/src/apps/webpositive/URLInputGroup.cpp +++ b/src/apps/webpositive/URLInputGroup.cpp @@ -382,17 +382,20 @@ URLInputGroup::URLTextView::InsertText(const char* inText, int32 inLength, BFont font; GetFont(&font); - const rgb_color black = (rgb_color) { 0, 0, 0, 255 }; - const rgb_color gray = (rgb_color) { 60, 60, 60, 255 }; + const rgb_color hostColor = ui_color(B_DOCUMENT_TEXT_COLOR); + const rgb_color urlColor = tint_color(hostColor, + (hostColor.Brightness() < 128 ? B_LIGHTEN_1_TINT : B_DARKEN_1_TINT)); if (baseUrlStart > 0) - SetFontAndColor(0, baseUrlStart, &font, B_FONT_ALL, &gray); + SetFontAndColor(0, baseUrlStart, &font, B_FONT_ALL, &urlColor); if (baseUrlEnd > baseUrlStart) { font.SetFace(B_BOLD_FACE); - SetFontAndColor(baseUrlStart, baseUrlEnd, &font, B_FONT_ALL, &black); + SetFontAndColor(baseUrlStart, baseUrlEnd, &font, B_FONT_ALL, + &hostColor); } if (baseUrlEnd < TextLength()) { font.SetFace(B_REGULAR_FACE); - SetFontAndColor(baseUrlEnd, TextLength(), &font, B_FONT_ALL, &gray); + SetFontAndColor(baseUrlEnd, TextLength(), &font, B_FONT_ALL, + &urlColor); } fURLAutoCompleter->TextModified(fUpdateAutoCompleterChoices);