Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve BButton Color Adaptability

Browse Source 
View color now shows through, so we keep the view color in sync with the
parent to act as the button background color.  The low color is used to
determine the button color.  The high color is used to determine the
button label color.

The default low and high colors are the control background and text colors,
respectfully. To maintain the identical appearance as before, the default
control background color is tinted to match the default panel background
color. As the color has a gradient applied anyway, no one will notice a
difference while playing with custom control colors.

Fixes #12568.

Signed-off-by: Jessica Hamilton <jessica.l.hamilton@gmail.com>
This commit is contained in:
looncraz 2016-01-09 13:13:21 -06:00 committed by Jessica Hamilton
parent 405208a782
commit d2d239f4c4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kits/interface/Button.cpp
View File

@ -133,10 +133,10 @@ void
BButton::Draw(BRect updateRect) BButton::Draw(BRect updateRect)
{ {
BRect rect(Bounds()); BRect rect(Bounds());
rgb_color background = LowColor(); rgb_color background = ViewColor();
rgb_color base = LowColor();
rgb_color textColor = HighColor();
// Darken default control color to match default panel color.
rgb_color base = tint_color(ui_color(B_CONTROL_BACKGROUND_COLOR), 1.115);
uint32 flags = be_control_look->Flags(this); uint32 flags = be_control_look->Flags(this);
if (_Flag(FLAG_DEFAULT)) if (_Flag(FLAG_DEFAULT))
flags |= BControlLook::B_DEFAULT_BUTTON; flags |= BControlLook::B_DEFAULT_BUTTON;
@ -163,8 +163,9 @@ BButton::Draw(BRect updateRect)
(Value() == B_CONTROL_OFF (Value() == B_CONTROL_OFF
? B_INACTIVE_ICON_BITMAP : B_ACTIVE_ICON_BITMAP) ? B_INACTIVE_ICON_BITMAP : B_ACTIVE_ICON_BITMAP)
| (IsEnabled() ? 0 : B_DISABLED_ICON_BITMAP)); | (IsEnabled() ? 0 : B_DISABLED_ICON_BITMAP));
be_control_look->DrawLabel(this, Label(), icon, rect, updateRect,
base, flags, BAlignment(B_ALIGN_CENTER, B_ALIGN_MIDDLE)); be_control_look->DrawLabel(this, Label(), icon, rect, updateRect, base,
flags, BAlignment(B_ALIGN_CENTER, B_ALIGN_MIDDLE), &textColor);
} }
@ -230,6 +231,10 @@ BButton::AttachedToWindow()
{ {
BControl::AttachedToWindow(); BControl::AttachedToWindow();
// Tint default control background color to match default panel background.
SetLowUIColor(B_CONTROL_BACKGROUND_COLOR, 1.115);
SetHighUIColor(B_CONTROL_TEXT_COLOR);
if (IsDefault()) if (IsDefault())
Window()->SetDefaultButton(this); Window()->SetDefaultButton(this);
} }