Qt: FSC, don't move if you clicked on a button (and not the plain controller )

Close #2429 and #2460.

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 56ac3d84eebe11226785d126616943dc38c882cc..75f83f8785bad9bc36e3b6a9deb892488e81dc64 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -910,8 +910,11 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
  */
 void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event )
 {
-    if ( event->buttons() == Qt::LeftButton )
+    if( event->buttons() == Qt::LeftButton )
     {
+        if( i_mouse_last_x == -1 || i_mouse_last_y == -1 )
+            return;
+
         int i_moveX = event->globalX() - i_mouse_last_x;
         int i_moveY = event->globalY() - i_mouse_last_y;
 
@@ -932,6 +935,12 @@ void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
     i_mouse_last_y = event->globalY();
 }
 
+void FullscreenControllerWidget::mouseReleaseEvent( QMouseEvent *event )
+{
+    i_mouse_last_x = -1;
+    i_mouse_last_y = -1;
+}
+
 /**
  * On mouse go above FSC
  */
@@ -1095,6 +1104,7 @@ void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout,
     }
     vlc_mutex_unlock( &lock );
 }
+
 /**
  * Mouse change callback (show/hide the controller on mouse movement)
  */

diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
index 8d3376805f08f2519ba8779554ccb123f02ae954..4b43d56175530fe738a210c61d249ededa31223b 100644 (file)
--- a/modules/gui/qt4/components/controller.hpp
+++ b/modules/gui/qt4/components/controller.hpp
@@ -244,6 +244,7 @@ protected:
 
     virtual void mouseMoveEvent( QMouseEvent *event );
     virtual void mousePressEvent( QMouseEvent *event );
+    virtual void mouseReleaseEvent( QMouseEvent *event );
     virtual void enterEvent( QEvent *event );
     virtual void leaveEvent( QEvent *event );
     virtual void keyPressEvent( QKeyEvent *event );