Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 25 |
1 files changed, 10 insertions, 15 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 | |||
@@ -108,14 +108,12 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
109 | buttonMask.fill( 0 ); | 109 | buttonMask.fill( 0 ); |
110 | 110 | ||
111 | masks.reserve( buttonCount ); | 111 | for ( uint i = 0; i < buttons.size(); i++ ) { |
112 | |||
113 | for ( uint i = 0; i < masks.capacity(); i++ ) { | ||
114 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); | 112 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); |
115 | masks.push_back( QBitmap( filename ) ); | 113 | buttons[ i ].mask =QBitmap( filename ); |
116 | 114 | ||
117 | if ( !masks[i].isNull() ) { | 115 | if ( !buttons[i].mask.isNull() ) { |
118 | QImage imgMask = masks[i].convertToImage(); | 116 | QImage imgMask = buttons[i].mask.convertToImage(); |
119 | uchar **dest = buttonMask.jumpTable(); | 117 | uchar **dest = buttonMask.jumpTable(); |
120 | for ( int y = 0; y < imgUp.height(); y++ ) { | 118 | for ( int y = 0; y < imgUp.height(); y++ ) { |
121 | uchar *line = dest[y]; | 119 | uchar *line = dest[y]; |
@@ -127,9 +125,6 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
127 | 125 | ||
128 | } | 126 | } |
129 | 127 | ||
130 | buttonPixUp.resize( masks.size(), QPixmap() ); | ||
131 | buttonPixDown.resize( masks.size(), QPixmap() ); | ||
132 | |||
133 | setBackgroundPixmap( pixBg ); | 128 | setBackgroundPixmap( pixBg ); |
134 | 129 | ||
135 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 130 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
@@ -215,10 +210,10 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
215 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); | 210 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); |
216 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); | 211 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); |
217 | 212 | ||
218 | for ( uint i = 0; i < masks.size(); i++ ) { | 213 | for ( uint i = 0; i < buttons.size(); i++ ) { |
219 | if ( !masks[i].isNull() ) { | 214 | if ( !buttons[i].mask.isNull() ) { |
220 | buttonPixUp[i] = maskPixToMask( pixUp, masks[i] ); | 215 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); |
221 | buttonPixDown[i] = maskPixToMask( pixDn, masks[i] ); | 216 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); |
222 | } | 217 | } |
223 | } | 218 | } |
224 | } | 219 | } |
@@ -322,9 +317,9 @@ void AudioWidget::setToggleButton( int i, bool down ) { | |||
322 | 317 | ||
323 | void AudioWidget::paintButton( QPainter &p, int i ) { | 318 | void AudioWidget::paintButton( QPainter &p, int i ) { |
324 | if ( buttons[i].isDown ) { | 319 | if ( buttons[i].isDown ) { |
325 | p.drawPixmap( upperLeftOfButtonMask, buttonPixDown[i] ); | 320 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown ); |
326 | } else { | 321 | } else { |
327 | p.drawPixmap( upperLeftOfButtonMask, buttonPixUp[i] ); | 322 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp ); |
328 | } | 323 | } |
329 | } | 324 | } |
330 | 325 | ||