- moved the duplicated code for checking whether the mouse is over a

  button into a shared isOverButton method

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
@@ -381,12 +381,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.size(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
-            int x = event->pos().x() - upperLeftOfButtonMask.x();
-            int y = event->pos().y() - upperLeftOfButtonMask.y();
-
-            bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width()
-                                && y < buttonMask.height()
-                                && buttonMask.pixelIndex( x, y ) == i + 1 );
+            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
             if ( isOnButton && !buttons[i].isHeld ) {
                 buttons[i].isHeld = TRUE;
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
@@ -60,5 +60,13 @@ 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 );
+}
+
 /* 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
@@ -65,6 +65,8 @@ protected:
 
     void handleCommand( Command command, bool buttonDown );
 
+    bool isOverButton( const QPoint &position, int buttonId ) const;
+
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
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
@@ -282,12 +282,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.size(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
-            int x = event->pos().x() - upperLeftOfButtonMask.x();
-            int y = event->pos().y() - upperLeftOfButtonMask.y();
-
-            bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width()
-                                && y < buttonMask.height()
-                                && buttonMask.pixelIndex( x, y ) == i + 1 );
+            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
             if ( isOnButton && !buttons[i].isHeld ) {
                 buttons[i].isHeld = TRUE;