Diffstat (limited to 'core/applets/batteryapplet/battery.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 3b329c6..f3a95ed 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -22,4 +22,5 @@ | |||
22 | 22 | ||
23 | #include <qpe/power.h> | 23 | #include <qpe/power.h> |
24 | #include <qpe/applnk.h> | ||
24 | 25 | ||
25 | #include <qpainter.h> | 26 | #include <qpainter.h> |
@@ -32,5 +33,5 @@ BatteryMeter::BatteryMeter( QWidget *parent ) | |||
32 | ps = new PowerStatus; | 33 | ps = new PowerStatus; |
33 | startTimer( 10000 ); | 34 | startTimer( 10000 ); |
34 | setFixedHeight(12); | 35 | setFixedHeight( AppLnk::smallIconSize() ); |
35 | chargeTimer = new QTimer( this ); | 36 | chargeTimer = new QTimer( this ); |
36 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); | 37 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); |
@@ -45,5 +46,5 @@ BatteryMeter::~BatteryMeter() | |||
45 | QSize BatteryMeter::sizeHint() const | 46 | QSize BatteryMeter::sizeHint() const |
46 | { | 47 | { |
47 | return QSize(10,12); | 48 | return QSize(10, height() ); |
48 | } | 49 | } |
49 | 50 | ||
@@ -117,10 +118,10 @@ void BatteryMeter::paintEvent( QPaintEvent* ) | |||
117 | } | 118 | } |
118 | 119 | ||
119 | int w = 6; | 120 | int w = height() / 2 ; |
120 | int h = height()-3; | 121 | int h = height() - 4; |
121 | int pix = (percent * h) / 100; | 122 | int pix = (percent * h) / 100; |
122 | int y2 = height() - 2; | 123 | int y2 = height() -2; |
123 | int y = y2 - pix; | 124 | int y = y2 - pix; |
124 | int x1 = (width() - w) / 2; | 125 | int x1 = (width() - w ) / 2; |
125 | 126 | ||
126 | p.setPen(QColor(80,80,80)); | 127 | p.setPen(QColor(80,80,80)); |
@@ -141,5 +142,5 @@ void BatteryMeter::paintEvent( QPaintEvent* ) | |||
141 | DRAWUPPER(4); | 142 | DRAWUPPER(4); |
142 | 143 | ||
143 | #define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1,i+x1,y2); } | 144 | #define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1, i+x1,y2); } |
144 | p.setPen( c ); | 145 | p.setPen( c ); |
145 | DRAW(1); | 146 | DRAW(1); |