hrev51564 adds 1 changeset to branch 'master'
old head: aafb7e69a992912f91bfd4068bc79da1575c1d14
new head: 24c9b9df7a0fe40368c1adac8a6f9fced558023e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=24c9b9df7a0f+%5Eaafb7e69a992
----------------------------------------------------------------------------
24c9b9df7a0f: [PowerStatus] Fixes some drawing glitches
* Fixes the position of the lightning over the battery
* Fixes the selection in the info Window (Why is the selected color
hardcoded?)
* Fixes #13784
[ Janus <janus2@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51564
Commit: 24c9b9df7a0fe40368c1adac8a6f9fced558023e
URL: http://cgit.haiku-os.org/haiku/commit/?id=24c9b9df7a0f
Author: Janus <janus2@xxxxxxxxx>
Date: Sun Nov 19 00:00:47 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13784
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 5 deletions(-)
src/apps/powerstatus/ExtendedInfoWindow.cpp | 9 +++++----
src/apps/powerstatus/PowerStatusView.cpp | 3 ++-
----------------------------------------------------------------------------
diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp
b/src/apps/powerstatus/ExtendedInfoWindow.cpp
index 543fb87..7e240f0 100644
--- a/src/apps/powerstatus/ExtendedInfoWindow.cpp
+++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp
@@ -279,11 +279,12 @@
ExtPowerStatusView::ExtPowerStatusView(PowerStatusDriverInterface* interface,
void
ExtPowerStatusView::Draw(BRect updateRect)
{
- if (fSelected)
+ if (fSelected) {
+ rgb_color lowColor = LowColor();
SetLowColor(102, 152, 203);
- else
- SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
+ FillRect(updateRect, B_SOLID_LOW);
+ SetLowColor(lowColor);
+ }
PowerStatusView::Draw(updateRect);
}
diff --git a/src/apps/powerstatus/PowerStatusView.cpp
b/src/apps/powerstatus/PowerStatusView.cpp
index eae7391..81bb06e 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -163,6 +163,7 @@ PowerStatusView::MessageReceived(BMessage *message)
void
PowerStatusView::_DrawBattery(BRect rect)
{
+ BRect lightningRect = rect;
float quarter = floorf((rect.Height() + 1) / 4);
rect.top += quarter;
rect.bottom -= quarter;
@@ -246,7 +247,7 @@ PowerStatusView::_DrawBattery(BRect rect)
// When charging, draw a lightning symbol over the battery.
SetHighColor(255, 255, 0, 180);
SetDrawingMode(B_OP_ALPHA);
- SetScale(std::min(Bounds().Width(), Bounds().Height()) / 16);
+ SetScale(std::min(lightningRect.Width(),
lightningRect.Height()) / 16);
static const BPoint points[] = {
BPoint(3, 14),
