summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index a3d34f4..2cb1385 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -374,10 +374,11 @@ void AudioWidget::toggleButton( int i ) {
374 374
375 375
376void AudioWidget::paintButton( QPainter *p, int i ) { 376void AudioWidget::paintButton( QPainter *p, int i ) {
377 if ( audioButtons[i].isDown ) 377 if ( audioButtons[i].isDown ) {
378 p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); 378 p->drawPixmap( xoff, yoff, *buttonPixDown[i] );
379 else 379 } else {
380 p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); 380 p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
381 }
381} 382}
382 383
383 384
@@ -412,20 +413,18 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
412void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { 413void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
413 for ( int i = 0; i < numButtons; i++ ) { 414 for ( int i = 0; i < numButtons; i++ ) {
414 if ( event->state() == QMouseEvent::LeftButton ) { 415 if ( event->state() == QMouseEvent::LeftButton ) {
415 416 // The test to see if the mouse click is inside the button or not
416 // The test to see if the mouse click is inside the button or not
417 int x = event->pos().x() - xoff; 417 int x = event->pos().x() - xoff;
418 int y = event->pos().y() - yoff; 418 int y = event->pos().y() - yoff;
419 419
420 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() 420 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
421 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); 421 && y < imgButtonMask->height()
422 422 && imgButtonMask->pixelIndex( x, y ) == i + 1 );
423 if ( isOnButton && i == AudioVolumeUp )
424 qDebug("on up");
425 423
426 if ( isOnButton && !audioButtons[i].isHeld ) { 424 if ( isOnButton && !audioButtons[i].isHeld ) {
427 audioButtons[i].isHeld = TRUE; 425 audioButtons[i].isHeld = TRUE;
428 toggleButton(i); 426 toggleButton(i);
427
429 switch (i) { 428 switch (i) {
430 case AudioVolumeUp: 429 case AudioVolumeUp:
431 qDebug("more clicked"); 430 qDebug("more clicked");