| -rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 25 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 9 |
2 files changed, 15 insertions, 19 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6e9c14a..87e06ee 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -109,12 +109,10 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye buttonMask.fill( 0 ); - masks.reserve( buttonCount ); - - for ( uint i = 0; i < masks.capacity(); i++ ) { + for ( uint i = 0; i < buttons.size(); i++ ) { QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); - masks.push_back( QBitmap( filename ) ); + buttons[ i ].mask =QBitmap( filename ); - if ( !masks[i].isNull() ) { - QImage imgMask = masks[i].convertToImage(); + if ( !buttons[i].mask.isNull() ) { + QImage imgMask = buttons[i].mask.convertToImage(); uchar **dest = buttonMask.jumpTable(); for ( int y = 0; y < imgUp.height(); y++ ) { @@ -128,7 +126,4 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye } - buttonPixUp.resize( masks.size(), QPixmap() ); - buttonPixDown.resize( masks.size(), QPixmap() ); - setBackgroundPixmap( pixBg ); @@ -216,8 +211,8 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); - for ( uint i = 0; i < masks.size(); i++ ) { - if ( !masks[i].isNull() ) { - buttonPixUp[i] = maskPixToMask( pixUp, masks[i] ); - buttonPixDown[i] = maskPixToMask( pixDn, masks[i] ); + for ( uint i = 0; i < buttons.size(); i++ ) { + if ( !buttons[i].mask.isNull() ) { + buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); + buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); } } @@ -323,7 +318,7 @@ void AudioWidget::setToggleButton( int i, bool down ) { void AudioWidget::paintButton( QPainter &p, int i ) { if ( buttons[i].isDown ) { - p.drawPixmap( upperLeftOfButtonMask, buttonPixDown[i] ); + p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown ); } else { - p.drawPixmap( upperLeftOfButtonMask, buttonPixUp[i] ); + p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp ); } } diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 2641df6..504b705 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -25,4 +25,5 @@ #include <qwidget.h> +#include <qmap.h> #include "mediaplayerstate.h" @@ -45,4 +46,8 @@ public: bool isHeld : 1; bool isDown : 1; + + QBitmap mask; + QPixmap pixUp; + QPixmap pixDown; }; typedef std::vector<Button> ButtonVector; @@ -91,8 +96,4 @@ protected: QImage buttonMask; - MaskVector masks; - PixmapVector buttonPixUp; - PixmapVector buttonPixDown; - QPoint upperLeftOfButtonMask; }; |