Fix color widgets incorrectly change colors when mouse is hovered

over widget
qgis · Jan 31, 2022 · d955851 · d955851
1 parent c5b0ac9
commit d955851
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 16 deletions.
diff --git a/python/gui/auto_generated/qgscolorwidgets.sip.in b/python/gui/auto_generated/qgscolorwidgets.sip.in
@@ -367,6 +367,8 @@ Construct a new color box widget.
 
     virtual void mousePressEvent( QMouseEvent *event );
 
+    virtual void mouseReleaseEvent( QMouseEvent *event );
+
 
 };
 
@@ -486,6 +488,8 @@ Emitted when the widget's color component value changes
 
     virtual void mousePressEvent( QMouseEvent *event );
 
+    virtual void mouseReleaseEvent( QMouseEvent *event );
+
     virtual void keyPressEvent( QKeyEvent *event );
 
 

diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp
@@ -601,33 +601,50 @@ void QgsColorWheel::setColorFromPos( const QPointF pos )
 
 void QgsColorWheel::mouseMoveEvent( QMouseEvent *event )
 {
-  setColorFromPos( event->pos() );
+  if ( mIsDragging )
+    setColorFromPos( event->pos() );
+
   QgsColorWidget::mouseMoveEvent( event );
 }
 
 void QgsColorWheel::mousePressEvent( QMouseEvent *event )
 {
-  //calculate where the event occurred -- on the wheel or inside the triangle?
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = true;
+    //calculate where the event occurred -- on the wheel or inside the triangle?
 
-  //create a line from the widget's center to the event
-  const QLineF line = QLineF( width() / 2.0, height() / 2.0, event->pos().x(), event->pos().y() );
+    //create a line from the widget's center to the event
+    const QLineF line = QLineF( width() / 2.0, height() / 2.0, event->pos().x(), event->pos().y() );
 
-  const double innerLength = mWheelImage->width() / 2.0 - mWheelThickness;
-  if ( line.length() < innerLength )
-  {
-    mClickedPart = QgsColorWheel::Triangle;
+    const double innerLength = mWheelImage->width() / 2.0 - mWheelThickness;
+    if ( line.length() < innerLength )
+    {
+      mClickedPart = QgsColorWheel::Triangle;
+    }
+    else
+    {
+      mClickedPart = QgsColorWheel::Wheel;
+    }
+    setColorFromPos( event->pos() );
   }
   else
   {
-    mClickedPart = QgsColorWheel::Wheel;
+    QgsColorWidget::mousePressEvent( event );
   }
-  setColorFromPos( event->pos() );
 }
 
 void QgsColorWheel::mouseReleaseEvent( QMouseEvent *event )
 {
-  Q_UNUSED( event )
-  mClickedPart = QgsColorWheel::None;
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = false;
+    mClickedPart = QgsColorWheel::None;
+  }
+  else
+  {
+    QgsColorWidget::mouseReleaseEvent( event );
+  }
 }
 
 void QgsColorWheel::createWheel()
@@ -843,13 +860,36 @@ void QgsColorBox::resizeEvent( QResizeEvent *event )
 
 void QgsColorBox::mouseMoveEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->pos() );
+  if ( mIsDragging )
+  {
+    setColorFromPoint( event->pos() );
+  }
   QgsColorWidget::mouseMoveEvent( event );
 }
 
 void QgsColorBox::mousePressEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->pos() );
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = true;
+    setColorFromPoint( event->pos() );
+  }
+  else
+  {
+    QgsColorWidget::mousePressEvent( event );
+  }
+}
+
+void QgsColorBox::mouseReleaseEvent( QMouseEvent *event )
+{
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = false;
+  }
+  else
+  {
+    QgsColorWidget::mouseReleaseEvent( event );
+  }
 }
 
 void QgsColorBox::createBox()
@@ -1161,7 +1201,11 @@ void QgsColorRampWidget::setMarkerSize( const int markerSize )
 
 void QgsColorRampWidget::mouseMoveEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->pos() );
+  if ( mIsDragging )
+  {
+    setColorFromPoint( event->pos() );
+  }
+
   QgsColorWidget::mouseMoveEvent( event );
 }
 
@@ -1190,7 +1234,27 @@ void QgsColorRampWidget::wheelEvent( QWheelEvent *event )
 
 void QgsColorRampWidget::mousePressEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->pos() );
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = true;
+    setColorFromPoint( event->pos() );
+  }
+  else
+  {
+    QgsColorWidget::mousePressEvent( event );
+  }
+}
+
+void QgsColorRampWidget::mouseReleaseEvent( QMouseEvent *event )
+{
+  if ( event->button() == Qt::LeftButton )
+  {
+    mIsDragging = false;
+  }
+  else
+  {
+    QgsColorWidget::mousePressEvent( event );
+  }
 }
 
 void QgsColorRampWidget::keyPressEvent( QKeyEvent *event )

diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h
@@ -323,6 +323,8 @@ class GUI_EXPORT QgsColorWheel : public QgsColorWidget
       Triangle
     };
 
+    bool mIsDragging = false;
+
     /*Margin between outer ring and edge of widget*/
     int mMargin = 4;
 
@@ -410,9 +412,12 @@ class GUI_EXPORT QgsColorBox : public QgsColorWidget
     void resizeEvent( QResizeEvent *event ) override;
     void mouseMoveEvent( QMouseEvent *event ) override;
     void mousePressEvent( QMouseEvent *event ) override;
+    void mouseReleaseEvent( QMouseEvent *event ) override;
 
   private:
 
+    bool mIsDragging = false;
+
     /*Margin between outer ring and edge of widget*/
     int mMargin = 2;
 
@@ -565,10 +570,13 @@ class GUI_EXPORT QgsColorRampWidget : public QgsColorWidget
     void mouseMoveEvent( QMouseEvent *event ) override;
     void wheelEvent( QWheelEvent *event ) override;
     void mousePressEvent( QMouseEvent *event ) override;
+    void mouseReleaseEvent( QMouseEvent *event ) override;
     void keyPressEvent( QKeyEvent *event ) override;
 
   private:
 
+    bool mIsDragging = false;
+
     /*Orientation for ramp*/
     Orientation mOrientation;