-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 7 |
4 files changed, 12 insertions, 12 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 | |||
@@ -383,8 +383,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
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 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index a1b292e..1d18d6f 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -62,2 +62,10 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) | |||
62 | 62 | ||
63 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | ||
64 | { | ||
65 | return ( position.x() > 0 && position.y() > 0 && | ||
66 | position.x() < buttonMask.width() && | ||
67 | position.y() < buttonMask.height() && | ||
68 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | ||
69 | } | ||
70 | |||
63 | /* vim: et sw=4 ts=4 | 71 | /* vim: et sw=4 ts=4 |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 7e6cb3b..6e12a3b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -67,2 +67,4 @@ protected: | |||
67 | 67 | ||
68 | bool isOverButton( const QPoint &position, int buttonId ) const; | ||
69 | |||
68 | MediaPlayerState &mediaPlayerState; | 70 | MediaPlayerState &mediaPlayerState; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 6ab6d7b..6451ac4 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -284,8 +284,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
284 | // The test to see if the mouse click is inside the button or not | 284 | // The test to see if the mouse click is inside the button or not |
285 | int x = event->pos().x() - upperLeftOfButtonMask.x(); | 285 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
286 | int y = event->pos().y() - upperLeftOfButtonMask.y(); | ||
287 | |||
288 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() | ||
289 | && y < buttonMask.height() | ||
290 | && buttonMask.pixelIndex( x, y ) == i + 1 ); | ||
291 | 286 | ||