author | simon <simon> | 2002-12-09 15:31:35 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 15:31:35 (UTC) |
commit | 159a3334ecd168f422afe81853998373457fefa0 (patch) (side-by-side diff) | |
tree | 2672138cdabca5b73f3828d3b88b31bb1b280c67 /noncore | |
parent | ab22599627d84a6c6427d2440da4271b48f47c8e (diff) | |
download | opie-159a3334ecd168f422afe81853998373457fefa0.zip opie-159a3334ecd168f422afe81853998373457fefa0.tar.gz opie-159a3334ecd168f422afe81853998373457fefa0.tar.bz2 |
- minor cleanup in paintEvent
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index b73a5c0..271f788 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp @@ -51,33 +51,30 @@ void MediaWidget::paintEvent( QPaintEvent *pe ) if ( mediaPlayerState.isFullscreen() ) { // Clear the background p.setBrush( QBrush( Qt::black ) ); return; } if ( !pe->erased() ) { // Combine with background and double buffer QPixmap pix( pe->rect().size() ); QPainter p( &pix ); p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() ); - for ( unsigned int i = 0; i < buttons.count(); i++ ) { - paintButton( p, buttons[ i ] ); - } + paintAllButtons( p ); QPainter p2( this ); p2.drawPixmap( pe->rect().topLeft(), pix ); } else { QPainter p( this ); - for ( unsigned int i = 0; i < buttons.count(); i++ ) - paintButton( p, buttons[ i ] ); + paintAllButtons( p ); } } void MediaWidget::handleCommand( Command command, bool buttonDown ) { switch ( command ) { case Play: mediaPlayerState.togglePaused(); case Stop: mediaPlayerState.setPlaying(FALSE); return; case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; case Loop: mediaPlayerState.setLooping( buttonDown ); return; case VolumeUp: emit moreReleased(); return; @@ -87,24 +84,31 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) case Back: emit backReleased(); return; } } bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const { return ( position.x() > 0 && position.y() > 0 && position.x() < buttonMask.width() && position.y() < buttonMask.height() && buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); } +void MediaWidget::paintAllButtons( QPainter &p ) +{ + for ( ButtonMap::ConstIterator it = buttons.begin(); + it != buttons.end(); ++it ) + paintButton( *it ); +} + void MediaWidget::paintButton( const Button &button ) { QPainter p( this ); paintButton( p, button ); } void MediaWidget::paintButton( QPainter &p, const Button &button ) { if ( button.isDown ) p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); else p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index dcf7fb8..34910fb 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -78,24 +78,25 @@ signals: void forwardReleased(); void backReleased(); protected: virtual void closeEvent( QCloseEvent * ); virtual void paintEvent( QPaintEvent *pe ); void handleCommand( Command command, bool buttonDown ); bool isOverButton( const QPoint &position, int buttonId ) const; + void paintAllButtons( QPainter &p ); void paintButton( const Button &button ); void paintButton( QPainter &p, const Button &button ); void toggleButton( int buttonId ); MediaPlayerState &mediaPlayerState; PlayListWidget &playList; ButtonMap buttons; QImage buttonMask; |