| author | simon <simon> | 2002-12-09 15:49:37 (UTC) |
|---|---|---|
| committer | simon <simon> | 2002-12-09 15:49:37 (UTC) |
| commit | 743155915f659d701ad468eadcc2b2173b6e2770 (patch) (side-by-side diff) | |
| tree | e95ff8ac9e8781865214e92e8a7e84bbdd04b645 /noncore/multimedia/opieplayer2/videowidget.cpp | |
| parent | aa766a6a0818ed0b756f8cd67fc4a1c85906f224 (diff) | |
| download | opie-743155915f659d701ad468eadcc2b2173b6e2770.zip opie-743155915f659d701ad468eadcc2b2173b6e2770.tar.gz opie-743155915f659d701ad468eadcc2b2173b6e2770.tar.bz2 | |
- less indexing in the mouse event handler
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 673c9e8..9782b68 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -244,13 +244,16 @@ void VideoWidget::updateSlider( long i, long max ) { void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { for ( unsigned int i = 0; i < buttons.count(); i++ ) { + + Button &button = buttons[ i ]; + if ( event->state() == QMouseEvent::LeftButton ) { // The test to see if the mouse click is inside the button or not bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); - if ( isOnButton && !buttons[i].isHeld ) { - buttons[i].isHeld = TRUE; - toggleButton( buttons[ i ] ); + if ( isOnButton && !button.isHeld ) { + button.isHeld = TRUE; + toggleButton( button ); switch (i) { case VideoVolUp: @@ -260,27 +263,27 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { emit lessClicked(); return; } - } else if ( !isOnButton && buttons[i].isHeld ) { - buttons[i].isHeld = FALSE; - toggleButton( buttons[ i ] ); + } else if ( !isOnButton && button.isHeld ) { + button.isHeld = FALSE; + toggleButton( button ); } } else { - if ( buttons[i].isHeld ) { - buttons[i].isHeld = FALSE; - if ( buttons[i].type != ToggleButton ) { - setToggleButton( buttons[ i ], FALSE ); + if ( button.isHeld ) { + button.isHeld = FALSE; + if ( button.type != ToggleButton ) { + setToggleButton( button, FALSE ); } switch(i) { case VideoPlay: { if( mediaPlayerState.isPaused() ) { - setToggleButton( buttons[ i ], FALSE ); + setToggleButton( button, FALSE ); mediaPlayerState.setPaused( FALSE ); return; } else if( !mediaPlayerState.isPaused() ) { - setToggleButton( buttons[ i ], TRUE ); + setToggleButton( button, TRUE ); mediaPlayerState.setPaused( TRUE ); return; } else { |