Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-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 @@ -57,21 +57,18 @@ void MediaWidget::paintEvent( QPaintEvent *pe ) 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 ) { @@ -93,12 +90,19 @@ 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 ); } 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 @@ -84,12 +84,13 @@ protected: 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; |