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

  button into a shared isOverButton method

1 files changed, 1 insertions, 6 deletions

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
@@ -279,18 +279,13 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
 }
 
 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;
                 toggleButton(i);
 
                 switch (i) {