summaryrefslogtreecommitdiff
authordrw <drw>2004-12-20 23:49:31 (UTC)
committer drw <drw>2004-12-20 23:49:31 (UTC)
commitfaf7441b78dfc293f1dea1edebc202244fc3a1cf (patch) (side-by-side diff)
treee4db8589e4c8838fdf8ec5f71381e268c53dc0b0
parentef69c13359fc437a439eb3b018e7b29fb625c9a7 (diff)
downloadopie-faf7441b78dfc293f1dea1edebc202244fc3a1cf.zip
opie-faf7441b78dfc293f1dea1edebc202244fc3a1cf.tar.gz
opie-faf7441b78dfc293f1dea1edebc202244fc3a1cf.tar.bz2
Fix sizing of battery status popup window to prevent truncation of battery info
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 f27543c..addb517 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -226,37 +226,37 @@ void BatteryStatus::paintEvent( QPaintEvent * ev ) {
if (bat2) {
p.setPen(black);
QString text = statusTextIpaq();
p.drawText( 10, 150, text );
jacketMsg = tr("Jacket ") + jackChem;
} else {
jackPercent = 0;
jacketMsg = tr("No jacket with battery inserted");
}
int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100;
qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL);
drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 );
p.setPen( black );
p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg);
}
QFrame::paintEvent(ev);
}
QSize BatteryStatus::sizeHint() const {
QString text = statusText();
QString text2 = statusTextIpaq();
QFontMetrics fm = fontMetrics();
QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text );
QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 );
if ( bat2 ) {
return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
- r.width() ), 2 * 10 + 80 + r.height() + r2.height() );
+ r.width()+2*10 ), 2 * 10 + 80 + r.height() + r2.height() );
}
return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
- r.width() ), 2 * 10 + 40 + r.height() );
+ r.width()+2*10 ), 2 * 10 + 40 + r.height() );
}