added 1 changeset to branch 'refs/remotes/looncraz-github/setviewuicolor'
old head: a32c48f634c4d8101e351074b5120d98e55b9b6a
new head: 46b54c3e93ed754449b3fd84d4af2bb5b90a6b22
overview: https://github.com/looncraz/haiku/compare/a32c48f634c4...46b54c3e93ed
----------------------------------------------------------------------------
46b54c3e93ed: WebPositive
WebPositive colors now adapted.
Had to add in a little intelligent consideration for custom background
colors for status bar. Not sure how I missed that before.
[ looncraz <looncraz@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: 46b54c3e93ed754449b3fd84d4af2bb5b90a6b22
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Fri Oct 2 18:20:06 2015 UTC
----------------------------------------------------------------------------
5 files changed, 18 insertions(+), 8 deletions(-)
src/apps/webpositive/AuthenticationPanel.cpp | 2 +-
src/apps/webpositive/DownloadProgressView.cpp | 8 +++++---
src/apps/webpositive/support/FontSelectionView.cpp | 3 +--
src/apps/webpositive/tabview/TabManager.cpp | 2 +-
src/kits/interface/StatusBar.cpp | 11 ++++++++++-
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/AuthenticationPanel.cpp
b/src/apps/webpositive/AuthenticationPanel.cpp
index bfcde2d..c9e095a 100644
--- a/src/apps/webpositive/AuthenticationPanel.cpp
+++ b/src/apps/webpositive/AuthenticationPanel.cpp
@@ -120,7 +120,7 @@ bool AuthenticationPanel::getAuthentication(const BString&
text,
BTextView* textView = new BTextView(textBounds, "text", textBounds,
be_plain_font, &infoColor, B_FOLLOW_NONE, B_WILL_DRAW
| B_SUPPORTS_LAYOUT);
- textView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+ textView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
textView->SetText(text.String());
textView->MakeEditable(false);
textView->MakeSelectable(false);
diff --git a/src/apps/webpositive/DownloadProgressView.cpp
b/src/apps/webpositive/DownloadProgressView.cpp
index f7865dc..e3ce38b 100644
--- a/src/apps/webpositive/DownloadProgressView.cpp
+++ b/src/apps/webpositive/DownloadProgressView.cpp
@@ -116,7 +116,7 @@ public:
virtual void AttachedToWindow()
{
- SetViewColor(Parent()->ViewColor());
+ AdoptParentColors();
}
virtual void Draw(BRect updateRect)
@@ -274,6 +274,7 @@ DownloadProgressView::Init(BMessage* archive)
.TopView()
;
verticalGroup->SetViewColor(ViewColor());
+
layout->AddView(verticalGroup);
verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3)
.Add(fTopButton)
@@ -288,8 +289,6 @@ DownloadProgressView::Init(BMessage* archive)
float fontSize = font.Size() * 0.8f;
font.SetSize(max_c(8.0f, fontSize));
fInfoView->SetFont(&font, B_FONT_SIZE);
- fInfoView->SetHighColor(tint_color(fInfoView->LowColor(),
- B_DARKEN_4_TINT));
fInfoView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
return true;
@@ -340,6 +339,9 @@ DownloadProgressView::DetachedFromWindow()
void
DownloadProgressView::AllAttached()
{
+ fStatusBar->SetLowColor(ViewColor());
+ fInfoView->SetHighColor(0, 0, 0, 255);
+
SetViewColor(B_TRANSPARENT_COLOR);
SetLowColor(245, 245, 245);
SetHighColor(tint_color(LowColor(), B_DARKEN_1_TINT));
diff --git a/src/apps/webpositive/support/FontSelectionView.cpp
b/src/apps/webpositive/support/FontSelectionView.cpp
index 859095e..4d1c9ed 100644
--- a/src/apps/webpositive/support/FontSelectionView.cpp
+++ b/src/apps/webpositive/support/FontSelectionView.cpp
@@ -85,8 +85,7 @@ FontSelectionView::FontSelectionView(const char* name, const
char* label,
fPreviewText->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
B_SIZE_UNLIMITED));
-
fPreviewText->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
- 1.65));
+ fPreviewText->SetHighUIColor(B_PANEL_BACKGROUND_COLOR, 1.65);
fPreviewText->SetAlignment(B_ALIGN_RIGHT);
_UpdateFontPreview();
}
diff --git a/src/apps/webpositive/tabview/TabManager.cpp
b/src/apps/webpositive/tabview/TabManager.cpp
index 7938335..e9e3da8 100644
--- a/src/apps/webpositive/tabview/TabManager.cpp
+++ b/src/apps/webpositive/tabview/TabManager.cpp
@@ -338,7 +338,7 @@ public:
{
SetFlags(Flags() | B_WILL_DRAW);
SetViewColor(B_TRANSPARENT_COLOR);
- SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+ SetLowUIColor(B_PANEL_BACKGROUND_COLOR);
GroupLayout()->SetInsets(0, 6, 0, 0);
}
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index 3c82142..a17069b 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -318,7 +318,16 @@ BStatusBar::Draw(BRect updateRect)
font.TruncateString(&leftText, B_TRUNCATE_END, width);
}
- SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
+ rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
+
+ if (backgroundColor != ui_color(B_PANEL_BACKGROUND_COLOR)) {
+ if (backgroundColor.Brightness() > 100)
+ textColor = make_color(0, 0, 0, 255);
+ else
+ textColor = make_color(255, 255, 255, 255);
+ }
+
+ SetHighColor(textColor);
if (leftText.Length())
DrawString(leftText.String(), BPoint(rect.left,
baseLine));
