hrev50015 adds 3 changesets to branch 'master'
old head: dd1c7180263692dc1d6e16209b8c2e114db2f9e8
new head: 79a091e7dd3e512ead9019a690fcf1c145e56d94
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=79a091e7dd3e+%5Edd1c71802636
----------------------------------------------------------------------------
405208a7825b: PowerStatus background tint
Recent changes require us to adopt the tint value for PowerStatus's
low color as well as the ViewUIColor.
This repairs the issue where the replicant's background color was lighter
than the Deskbar's tray color.
Fixes #12566.
Signed-off-by: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
d2d239f4c46b: Improve BButton Color Adaptability
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@xxxxxxxxx>
79a091e7dd3e: Correct Tracker QueryPoseView Column Resize Appearance
PoseView's ColumnRedraw fills exposed areas in manually in an offscreen view
using the PoseView's LowColor. As QueryPoseView uses a custom view color it
is necessary for the low color to match, otherwise resizing a column will
draw the untinted document background color.
Fixes #12569.
Signed-off-by: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
[ looncraz <looncraz@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 16 insertions(+), 7 deletions(-)
src/apps/powerstatus/PowerStatusView.cpp | 7 +++++--
src/kits/interface/Button.cpp | 15 ++++++++++-----
src/kits/tracker/QueryPoseView.cpp | 1 +
############################################################################
Commit: 405208a7825b27a9b14d8ff14e7e3c4bb22148b8
URL: http://cgit.haiku-os.org/haiku/commit/?id=405208a7825b
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Sat Jan 9 17:31:18 2016 UTC
Committer: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Commit-Date: Sun Jan 10 20:27:04 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/12566
PowerStatus background tint
Recent changes require us to adopt the tint value for PowerStatus's
low color as well as the ViewUIColor.
This repairs the issue where the replicant's background color was lighter
than the Deskbar's tray color.
Fixes #12566.
Signed-off-by: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/apps/powerstatus/PowerStatusView.cpp
b/src/apps/powerstatus/PowerStatusView.cpp
index 0b1b4aa..ef09bc2 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -120,10 +120,13 @@ PowerStatusView::AttachedToWindow()
BView::AttachedToWindow();
AdoptParentColors();
- if (ViewUIColor() == B_NO_COLOR)
+ float tint = B_NO_TINT;
+ color_which which = ViewUIColor(&tint);
+
+ if (which == B_NO_COLOR)
SetLowUIColor(B_PANEL_BACKGROUND_COLOR);
else
- SetLowUIColor(ViewUIColor());
+ SetLowUIColor(which, tint);
Update();
}
############################################################################
Commit: d2d239f4c46bc6a0767a7af6ced60af7ff0237bd
URL: http://cgit.haiku-os.org/haiku/commit/?id=d2d239f4c46b
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Sat Jan 9 19:13:21 2016 UTC
Committer: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Commit-Date: Sun Jan 10 20:27:04 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/12568
Improve BButton Color Adaptability
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@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Button.cpp b/src/kits/interface/Button.cpp
index ab728e5..6d3fd4b 100644
--- a/src/kits/interface/Button.cpp
+++ b/src/kits/interface/Button.cpp
@@ -133,10 +133,10 @@ void
BButton::Draw(BRect updateRect)
{
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);
if (_Flag(FLAG_DEFAULT))
flags |= BControlLook::B_DEFAULT_BUTTON;
@@ -163,8 +163,9 @@ BButton::Draw(BRect updateRect)
(Value() == B_CONTROL_OFF
? B_INACTIVE_ICON_BITMAP : B_ACTIVE_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();
+ // Tint default control background color to match default panel
background.
+ SetLowUIColor(B_CONTROL_BACKGROUND_COLOR, 1.115);
+ SetHighUIColor(B_CONTROL_TEXT_COLOR);
+
if (IsDefault())
Window()->SetDefaultButton(this);
}
############################################################################
Revision: hrev50015
Commit: 79a091e7dd3e512ead9019a690fcf1c145e56d94
URL: http://cgit.haiku-os.org/haiku/commit/?id=79a091e7dd3e
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Fri Jan 8 02:08:35 2016 UTC
Committer: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Commit-Date: Sun Jan 10 20:27:04 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/12569
Correct Tracker QueryPoseView Column Resize Appearance
PoseView's ColumnRedraw fills exposed areas in manually in an offscreen view
using the PoseView's LowColor. As QueryPoseView uses a custom view color it
is necessary for the low color to match, otherwise resizing a column will
draw the untinted document background color.
Fixes #12569.
Signed-off-by: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/QueryPoseView.cpp
b/src/kits/tracker/QueryPoseView.cpp
index 2953bcd..bafe85f 100644
--- a/src/kits/tracker/QueryPoseView.cpp
+++ b/src/kits/tracker/QueryPoseView.cpp
@@ -144,6 +144,7 @@ BQueryPoseView::AttachedToWindow()
{
_inherited::AttachedToWindow();
SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR, B_DARKEN_1_TINT);
+ SetLowUIColor(B_DOCUMENT_BACKGROUND_COLOR, B_DARKEN_1_TINT);
}
