i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Alexander von Gluck. Detect not-present / empty batteries. Fix #6952.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39732 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-12-05 00:48:56 +00:00
parent b8891e5123
commit 35d62b2c40
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/PowerStatusView.cpp
+14 -11
View File
@@ -1,10 +1,11 @@
/* /*
* Copyright 2006-2009, Haiku, Inc. All Rights Reserved. * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Axel Dörfler, [email protected] * Axel Dörfler, [email protected]
* Clemens Zeidler, [email protected] * Clemens Zeidler, [email protected]
* Alexander von Gluck, [email protected]
*/ */
@@ -177,8 +178,10 @@ PowerStatusView::_DrawBattery(BRect rect)
rect.left - 1, floorf(rect.bottom - rect.Height() / 4))); rect.left - 1, floorf(rect.bottom - rect.Height() / 4)));
int32 percent = fPercent; int32 percent = fPercent;
if (percent > 100 || percent < 0 || !fHasBattery) if (percent > 100)
percent = 100; percent = 100;
else if (percent < 0 || !fHasBattery)
percent = 0;
if (percent > 0) { if (percent > 0) {
rect.InsetBy(gap, gap); rect.InsetBy(gap, gap);
@@ -332,18 +335,18 @@ PowerStatusView::Update(bool force)
_GetBatteryInfo(&fBatteryInfo, fBatteryID); _GetBatteryInfo(&fBatteryInfo, fBatteryID);
if (fBatteryInfo.full_capacity != 0) fHasBattery = (fBatteryInfo.state & BATTERY_CRITICAL_STATE) == 0;
if (fBatteryInfo.full_capacity > 0 && fHasBattery) {
fPercent = (100 * fBatteryInfo.capacity) / fBatteryInfo.full_capacity; fPercent = (100 * fBatteryInfo.capacity) / fBatteryInfo.full_capacity;
fOnline = (fBatteryInfo.state & BATTERY_CHARGING) != 0;
fTimeLeft = fBatteryInfo.time_left; fTimeLeft = fBatteryInfo.time_left;
if ((fBatteryInfo.state & BATTERY_CHARGING) != 0) } else {
fOnline = true; fPercent = 0;
else
fOnline = false; fOnline = false;
fTimeLeft = false;
}
// TODO: if critical really means that, its name should be changed...
fHasBattery = (fBatteryInfo.state & BATTERY_CRITICAL_STATE) == 0
&& fPercent >= 0;
if (fInDeskbar) { if (fInDeskbar) {
// make sure the tray icon is large enough // make sure the tray icon is large enough