make applets more flexible regarding size

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
@@ -23,2 +23,3 @@
 #include <qpe/power.h>
+#include <qpe/applnk.h>
 
@@ -33,3 +34,3 @@ BatteryMeter::BatteryMeter( QWidget *parent )
     startTimer( 10000 );
-    setFixedHeight(12);
+    setFixedHeight( AppLnk::smallIconSize()  );
     chargeTimer = new QTimer( this );
@@ -46,3 +47,3 @@ QSize BatteryMeter::sizeHint() const
 {
-    return QSize(10,12);
+    return QSize(10, height() );
 }
@@ -118,8 +119,8 @@ void BatteryMeter::paintEvent( QPaintEvent* )
 
-    int w = 6;
-    int h = height()-3;
+    int w = height() / 2 ;
+    int h = height() - 4;
     int pix = (percent * h) / 100;
-    int y2 = height() - 2;
+    int y2 = height() -2;
     int y = y2 - pix;
-    int x1 = (width() - w) / 2;
+    int x1 = (width() - w ) / 2;
 
@@ -142,3 +143,3 @@ void BatteryMeter::paintEvent( QPaintEvent* )
 
-#define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1,i+x1,y2); }
+#define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1, i+x1,y2); }
     p.setPen( c );