From cef0a7b2621c207c7fe13e8b07f488665a85d484 Mon Sep 17 00:00:00 2001 From: looncraz Date: Tue, 5 Jan 2016 17:49:42 -0600 Subject: [PATCH] Deskbar: Correct StatusView colors following Set*UIColor merge. Previous colors matched the menu background color, but should have been darkened. The tint value was not being updated for the SetViewUIColor call construction, therefore the tint parameter was still B_NO_TINT. Signed-off-by: Augustin Cavalier --- src/apps/deskbar/StatusView.cpp | 4 +--- src/apps/deskbar/TimeView.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index 4b4746e20e..89913dc54a 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -167,10 +167,8 @@ TReplicantTray::AttachedToWindow() { BView::AttachedToWindow(); - float tint = B_NO_TINT; - if (be_control_look != NULL) { - SetViewUIColor(Parent()->ViewUIColor(&tint), tint); + AdoptParentColors(); } else { SetViewUIColor(B_MENU_BACKGROUND_COLOR, B_DARKEN_1_TINT); } diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp index 98fafb4e02..7c0803469b 100644 --- a/src/apps/deskbar/TimeView.cpp +++ b/src/apps/deskbar/TimeView.cpp @@ -135,11 +135,9 @@ TTimeView::AttachedToWindow() fCurrentTime = time(NULL); SetFont(be_plain_font); - float tint = B_NO_TINT; - if (Parent()) { fParent = Parent(); - SetViewUIColor(Parent()->ViewUIColor(&tint), tint); + AdoptParentColors(); } else SetViewUIColor(B_PANEL_BACKGROUND_COLOR);