author | brad <brad> | 2004-04-06 11:28:32 (UTC) |
---|---|---|
committer | brad <brad> | 2004-04-06 11:28:32 (UTC) |
commit | cbedf80c65fe86d0ca901a9f5f4519564ffdc90a (patch) (unidiff) | |
tree | ecaecc6ea6734fb07cdaf2bdd33b2206b7a54628 | |
parent | 4738d39e8168e24cbaae8a7ea3c71f00552d5dac (diff) | |
download | opie-cbedf80c65fe86d0ca901a9f5f4519564ffdc90a.zip opie-cbedf80c65fe86d0ca901a9f5f4519564ffdc90a.tar.gz opie-cbedf80c65fe86d0ca901a9f5f4519564ffdc90a.tar.bz2 |
Simple math rearrangement that fixes the drawing of the battery meter on my iPAQ
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index bd86f77..858a794 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -202,25 +202,25 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
202 | darkc = c.dark(200); | 202 | darkc = c.dark(200); |
203 | lightc = c.light(220); | 203 | lightc = c.light(220); |
204 | } else { | 204 | } else { |
205 | c = red; | 205 | c = red; |
206 | darkc = c.dark(280); | 206 | darkc = c.dark(280); |
207 | lightc = c.light(140); | 207 | lightc = c.light(140); |
208 | } | 208 | } |
209 | if ( percent < 0 ) | 209 | if ( percent < 0 ) |
210 | return; | 210 | return; |
211 | 211 | ||
212 | int rightEnd1 = width() - 47; | 212 | int rightEnd1 = width() - 47; |
213 | int rightEnd2 = width() - 35; | 213 | int rightEnd2 = width() - 35; |
214 | int percent2 = ( percent / 100 ) * rightEnd1 ; | 214 | int percent2 = (percent * rightEnd1) / 100; |
215 | p.setPen( black ); | 215 | p.setPen( black ); |
216 | qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); | 216 | qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); |
217 | qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); | 217 | qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); |
218 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); | 218 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); |
219 | drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); | 219 | drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); |
220 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 220 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); |
221 | p.setPen( black); | 221 | p.setPen( black); |
222 | 222 | ||
223 | 223 | ||
224 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 224 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { |
225 | 225 | ||
226 | p.drawText(15, 50, tr ("Ipaq ") + ipaqChem); | 226 | p.drawText(15, 50, tr ("Ipaq ") + ipaqChem); |