Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 4de7ea9..da0706e 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp @@ -48,4 +48,3 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount { - buttonMask = QImage( buttonAreaSize, 8, 255 ); - buttonMask.fill( 0 ); + buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize ); @@ -65,4 +64,3 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, button.type = buttonInfo.type; - - button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) ); + button.mask = skin.buttonMaskImage( buttonInfo.fileName ); @@ -71,20 +69,2 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, -QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage ) -{ - if ( maskImage.isNull() ) - return QBitmap(); - - uchar **dest = buttonMask.jumpTable(); - for ( int y = 0; y < buttonMask.height(); y++ ) { - uchar *line = dest[y]; - for ( int x = 0; x < buttonMask.width(); x++ ) - if ( !qRed( maskImage.pixel( x, y ) ) ) - line[x] = command + 1; - } - - // ### grmbl qt2. use constructor when switching to qt3. - QBitmap bm; bm = maskImage; - return bm; -} - void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) |