alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* avoid a couple unecessary vars/method calls

Browse Source 
* don't try and paint on a null pixmap

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=729679
This commit is contained in:
Aaron J. Seigo 2007-10-26 16:35:58 +00:00
parent e1868db200
commit 260a040477
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/widget.cpp
View File

@ -307,9 +307,12 @@ void Widget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
{ {
painter->setOpacity(d->opacity); painter->setOpacity(d->opacity);
/*
NOTE: put this back if we end up needing to control when things paint due to, e.g. zooming.
if (!d->shouldPaint(painter, transform())) { if (!d->shouldPaint(painter, transform())) {
return; return;
} }
*/
if (d->cachePaintMode == NoCacheMode) { if (d->cachePaintMode == NoCacheMode) {
paintWidget(painter, option, widget); paintWidget(painter, option, widget);
@ -318,7 +321,6 @@ void Widget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
// Cached painting // Cached painting
QRectF brect = boundingRect(); QRectF brect = boundingRect();
QRect boundingRectInt = brect.toRect();
// Fetch the off-screen transparent buffer and exposed area info. // Fetch the off-screen transparent buffer and exposed area info.
QPixmap pix; QPixmap pix;
@ -375,6 +377,12 @@ void Widget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
QTransform transform = painter->worldTransform(); QTransform transform = painter->worldTransform();
QRect deviceRect = transform.mapRect(brect).toRect(); QRect deviceRect = transform.mapRect(brect).toRect();
if (deviceRect.width() < 1 ||
deviceRect.height() < 1) {
// we have nothing to paint!
return;
}
// Auto-adjust the pixmap size. // Auto-adjust the pixmap size.
if (deviceRect.size() != pix.size()) { if (deviceRect.size() != pix.size()) {
pix = QPixmap(deviceRect.size()); pix = QPixmap(deviceRect.size());