From 9a9f4ef578de57d2abe476fe6326341b3d290818 Mon Sep 17 00:00:00 2001 From: Mikael Konradsson Date: Sat, 7 Sep 2019 11:32:22 +0000 Subject: [PATCH] Deskbar: Made expander knobs light when menu background is dark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I56a2fe1d4b1ce66476077e96e64066bf2950b4b4 Reviewed-on: https://review.haiku-os.org/c/haiku/+/1846 Reviewed-by: Stephan Aßmus --- src/apps/deskbar/TeamMenuItem.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps/deskbar/TeamMenuItem.cpp b/src/apps/deskbar/TeamMenuItem.cpp index 6fb53218a3..6fcecd8a56 100644 --- a/src/apps/deskbar/TeamMenuItem.cpp +++ b/src/apps/deskbar/TeamMenuItem.cpp @@ -308,9 +308,17 @@ TTeamMenuItem::DrawExpanderArrow() rect.OffsetTo(BPoint(frame.right - rect.Width(), ContentLocation().y + ((frame.Height() - rect.Height()) / 2))); + + float colorTint = B_DARKEN_3_TINT; + + rgb_color bgColor = ui_color(B_MENU_BACKGROUND_COLOR); + if (bgColor.red + bgColor.green + bgColor.blue <= 128 * 3) { + colorTint = B_LIGHTEN_2_TINT; + } + be_control_look->DrawArrowShape(menu, rect, rect, - ui_color(B_MENU_BACKGROUND_COLOR), fArrowDirection, 0, - B_DARKEN_3_TINT); + bgColor, fArrowDirection, 0, + colorTint); }