summaryrefslogtreecommitdiff
authorbrad <brad>2004-04-11 14:28:42 (UTC)
committer brad <brad>2004-04-11 14:28:42 (UTC)
commit66f497a5c7990d7e54cc1ae26995231ade55b86c (patch) (side-by-side diff)
treec2e2a97a1ff6b40b8f76775a7479e0f19e7fce88
parent9716f8c5672a8596306a9b432d9fabc4361baea5 (diff)
downloadopie-66f497a5c7990d7e54cc1ae26995231ade55b86c.zip
opie-66f497a5c7990d7e54cc1ae26995231ade55b86c.tar.gz
opie-66f497a5c7990d7e54cc1ae26995231ade55b86c.tar.bz2
Simple math reorganisation for jacket battery display (same as last one for main battery, I just missed it)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 858a794..ab8f36d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -215,37 +215,37 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
p.setPen( black );
qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL);
drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
p.setPen( black);
if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
p.drawText(15, 50, tr ("Ipaq ") + ipaqChem);
QString jacketMsg;
if (bat2) {
p.setPen(black);
p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
p.drawText(10,240, tr("Battery time remaining: ") + sec2);
jacketMsg = tr("Jacket ") + jackChem;
} else {
jackPercent = 0;
jacketMsg = tr("No jacket with battery inserted");
}
- int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ;
-
+ int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100;
+
qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL);
drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
p.setPen( black );
p.drawText(15, 180, jacketMsg);
}
}