| -rw-r--r-- | noncore/styles/theme/ogfxeffect.cpp | 6 | ||||
| -rw-r--r-- | noncore/styles/theme/othemestyle.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp index 2071a67..90b45fe 100644 --- a/noncore/styles/theme/ogfxeffect.cpp +++ b/noncore/styles/theme/ogfxeffect.cpp @@ -29,5 +29,6 @@ QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca, { + if ( !pixmap. isNull ( )) { QImage image = gradient(pixmap.size(), ca, cb, eff, ncols); pixmap.convertFromImage(image); - + } return pixmap; @@ -282,2 +283,3 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity, { + if ( !pixmap. isNull ( )) { QImage image = pixmap.convertToImage(); @@ -289,3 +291,3 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity, pixmap.convertFromImage(image); - + } return pixmap; diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp index a820efb..98e7253 100644 --- a/noncore/styles/theme/othemestyle.cpp +++ b/noncore/styles/theme/othemestyle.cpp @@ -251,2 +251,5 @@ void OThemeStyle::drawBaseButton( QPainter *p, int x, int y, int w, int h, { + if ( w <= 0 || h <= 0 ) + return; + int offset = borderPixmap( type ) ? 0 : decoWidth( type ); @@ -289,5 +292,6 @@ void OThemeStyle::drawBaseButton( QPainter *p, int x, int y, int w, int h, } - if ( borderPixmap( type ) ) + if ( borderPixmap( type ) ) { bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h, Qt::CopyROP, false ); + } else |