-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 11 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 26 |
2 files changed, 27 insertions, 10 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 | |||
@@ -123,2 +123,12 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
123 | 123 | ||
124 | QWidget *d = QApplication::desktop(); | ||
125 | int width = d->width(); | ||
126 | int height = d->height(); | ||
127 | |||
128 | if( (width != pixBg->width() ) || (height != pixBg->height() ) ) { | ||
129 | // qDebug("<<<<<<<< scale image >>>>>>>>>>>>"); | ||
130 | QImage img; | ||
131 | img = pixBg->convertToImage(); | ||
132 | pixBg->convertFromImage( img.smoothScale( width, height)); | ||
133 | } | ||
124 | setBackgroundPixmap( *pixBg ); | 134 | setBackgroundPixmap( *pixBg ); |
@@ -138,2 +148,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
138 | slider.setFocusPolicy( QWidget::NoFocus ); | 148 | slider.setFocusPolicy( QWidget::NoFocus ); |
149 | |||
139 | slider.setBackgroundPixmap( *pixBg ); | 150 | 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 | |||
@@ -99,4 +99,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
99 | 99 | ||
100 | for ( int i = 0; i < 7; i++ ) | 100 | for ( int i = 0; i < 7; i++ ) { |
101 | { | ||
102 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + | 101 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + |
@@ -106,11 +105,8 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
106 | 105 | ||
107 | if ( !masks[i]->isNull() ) | 106 | if ( !masks[i]->isNull() ) { |
108 | { | ||
109 | QImage imgMask = masks[i]->convertToImage(); | 107 | QImage imgMask = masks[i]->convertToImage(); |
110 | uchar **dest = imgButtonMask->jumpTable(); | 108 | uchar **dest = imgButtonMask->jumpTable(); |
111 | for ( int y = 0; y < imgUp->height(); y++ ) | 109 | for ( int y = 0; y < imgUp->height(); y++ ) { |
112 | { | ||
113 | uchar *line = dest[y]; | 110 | uchar *line = dest[y]; |
114 | for ( int x = 0; x < imgUp->width(); x++ ) | 111 | for ( int x = 0; x < imgUp->width(); x++ ) { |
115 | { | ||
116 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 112 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
@@ -122,4 +118,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
122 | // qDebug("finished loading first pics"); | 118 | // qDebug("finished loading first pics"); |
123 | for ( int i = 0; i < 7; i++ ) | 119 | for ( int i = 0; i < 7; i++ ) { |
124 | { | ||
125 | buttonPixUp[i] = NULL; | 120 | buttonPixUp[i] = NULL; |
@@ -128,2 +123,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
128 | 123 | ||
124 | |||
125 | QWidget *d = QApplication::desktop(); | ||
126 | int width = d->width(); | ||
127 | int height = d->height(); | ||
128 | |||
129 | if( (width != pixBg->width() ) || (height != pixBg->height() ) ) { | ||
130 | // qDebug("<<<<<<<< scale image >>>>>>>>>>>>"); | ||
131 | QImage img; | ||
132 | img = pixBg->convertToImage(); | ||
133 | pixBg->convertFromImage( img.smoothScale( width, height)); | ||
134 | } | ||
129 | setBackgroundPixmap( *pixBg ); | 135 | setBackgroundPixmap( *pixBg ); |