From 297aa21e4623c3194f16e47ea24450dc359f2ebb Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 14 Jan 2025 16:29:43 -0500 Subject: [PATCH] Deskbar: Always AdoptParentColors() on StatusView ... be_control_look is assumed. Change-Id: If41f74ede3debd5439093e0172294861f65f5d6b Reviewed-on: https://review.haiku-os.org/c/haiku/+/8832 Haiku-Format: Haiku-format Bot Reviewed-by: waddlesplash --- src/apps/deskbar/StatusView.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index 71faacfc86..19061dfa5b 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -180,11 +180,7 @@ TReplicantTray::AttachedToWindow() { BView::AttachedToWindow(); - if (be_control_look != NULL) { - AdoptParentColors(); - } else { - SetViewUIColor(B_MENU_BACKGROUND_COLOR, B_DARKEN_1_TINT); - } + AdoptParentColors(); SetDrawingMode(B_OP_COPY); Window()->SetPulseRate(1000000); @@ -1373,10 +1369,7 @@ TDragRegion::AttachedToWindow() CalculateRegions(); - if (be_control_look != NULL) - SetViewUIColor(B_MENU_BACKGROUND_COLOR, 1.1); - else - SetViewUIColor(B_MENU_BACKGROUND_COLOR); + SetViewUIColor(B_MENU_BACKGROUND_COLOR, 1.1); ResizeToPreferred(); } @@ -1789,10 +1782,7 @@ TResizeControl::AttachedToWindow() { BView::AttachedToWindow(); - if (be_control_look != NULL) - SetViewUIColor(B_MENU_BACKGROUND_COLOR, 1.1); - else - SetViewUIColor(B_MENU_BACKGROUND_COLOR); + SetViewUIColor(B_MENU_BACKGROUND_COLOR, 1.1); }