Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 4301a67..d083273 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -372,30 +372,25 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
372 | if ( skipDirection == +1 ) { | 372 | if ( skipDirection == +1 ) { |
373 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 373 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
374 | } else if ( skipDirection == -1 ) { | 374 | } else if ( skipDirection == -1 ) { |
375 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 375 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
376 | } | 376 | } |
377 | } | 377 | } |
378 | 378 | ||
379 | 379 | ||
380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | 380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { |
381 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { | 381 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
382 | if ( event->state() == QMouseEvent::LeftButton ) { | 382 | if ( event->state() == QMouseEvent::LeftButton ) { |
383 | // The test to see if the mouse click is inside the button or not | 383 | // The test to see if the mouse click is inside the button or not |
384 | int x = event->pos().x() - upperLeftOfButtonMask.x(); | 384 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
385 | int y = event->pos().y() - upperLeftOfButtonMask.y(); | ||
386 | |||
387 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() | ||
388 | && y < buttonMask.height() | ||
389 | && buttonMask.pixelIndex( x, y ) == i + 1 ); | ||
390 | 385 | ||
391 | if ( isOnButton && !buttons[i].isHeld ) { | 386 | if ( isOnButton && !buttons[i].isHeld ) { |
392 | buttons[i].isHeld = TRUE; | 387 | buttons[i].isHeld = TRUE; |
393 | toggleButton(i); | 388 | toggleButton(i); |
394 | switch (i) { | 389 | switch (i) { |
395 | case VolumeUp: | 390 | case VolumeUp: |
396 | emit moreClicked(); | 391 | emit moreClicked(); |
397 | return; | 392 | return; |
398 | case VolumeDown: | 393 | case VolumeDown: |
399 | emit lessClicked(); | 394 | emit lessClicked(); |
400 | return; | 395 | return; |
401 | case Forward: | 396 | case Forward: |