author | simon <simon> | 2002-12-09 15:23:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 15:23:45 (UTC) |
commit | ab22599627d84a6c6427d2440da4271b48f47c8e (patch) (side-by-side diff) | |
tree | 7afdd78444dc58245a5dd3a110f454354ddd3e2f /noncore | |
parent | 47d689545e68f2439cc88630ac78016712f92cc9 (diff) | |
download | opie-ab22599627d84a6c6427d2440da4271b48f47c8e.zip opie-ab22599627d84a6c6427d2440da4271b48f47c8e.tar.gz opie-ab22599627d84a6c6427d2440da4271b48f47c8e.tar.bz2 |
- minor cleanup
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3a44185..b73a5c0 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp @@ -91,30 +91,33 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) 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::paintButton( int buttonId ) +void MediaWidget::paintButton( const Button &button ) { QPainter p( this ); - paintButton( p, buttons[ buttonId ] ); + 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 ); } void MediaWidget::toggleButton( int buttonId ) { - buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown; - paintButton( buttonId ); + Button &button = buttons[ buttonId ]; + + button.isDown = !button.isDown; + + paintButton( button ); } /* vim: et sw=4 ts=4 */ diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8cdaad1..dcf7fb8 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -82,17 +82,17 @@ 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 paintButton( int buttonId ); + void paintButton( const Button &button ); void paintButton( QPainter &p, const Button &button ); void toggleButton( int buttonId ); MediaPlayerState &mediaPlayerState; PlayListWidget &playList; ButtonMap buttons; |