scale background image if needed

2 files changed, 28 insertions, 11 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index b187cb4..44fbe48 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -122,5 +122,15 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     }
 
-    setBackgroundPixmap( *pixBg );
+ 		QWidget *d = QApplication::desktop();
+ 		int width = d->width();
+ 		int height = d->height();
+
+    if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
+//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
+				QImage img;
+				img = pixBg->convertToImage();
+				pixBg->convertFromImage( img.smoothScale( width, height));
+		}
+    setBackgroundPixmap( *pixBg);
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
@@ -137,4 +147,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
+
     slider.setBackgroundPixmap( *pixBg );
 
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 02c8568..d9a9478 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -98,6 +98,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    imgButtonMask->fill( 0 );
 
-   for ( int i = 0; i < 7; i++ )
-   {
+   for ( int i = 0; i < 7; i++ ) {
       QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
                                   "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
@@ -105,13 +104,10 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
       masks[i] = new QBitmap( filename );
 
-      if ( !masks[i]->isNull() )
-      {
+      if ( !masks[i]->isNull() ) {
          QImage imgMask = masks[i]->convertToImage();
          uchar **dest = imgButtonMask->jumpTable();
-         for ( int y = 0; y < imgUp->height(); y++ )
-         {
+         for ( int y = 0; y < imgUp->height(); y++ ) {
             uchar *line = dest[y];
-            for ( int x = 0; x < imgUp->width(); x++ )
-            {
+            for ( int x = 0; x < imgUp->width(); x++ ) {
                if ( !qRed( imgMask.pixel( x, y ) ) )
                   line[x] = i + 1;
@@ -121,10 +117,20 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    }
    //   qDebug("finished loading first pics");
-   for ( int i = 0; i < 7; i++ )
-   {
+   for ( int i = 0; i < 7; i++ ) {
       buttonPixUp[i] = NULL;
       buttonPixDown[i] = NULL;
    }
 
+
+ 		QWidget *d = QApplication::desktop();
+ 		int width = d->width();
+ 		int height = d->height();
+
+    if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
+//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
+				QImage img;
+				img = pixBg->convertToImage();
+				pixBg->convertFromImage( img.smoothScale( width, height));
+		}
    setBackgroundPixmap( *pixBg );