[color picker] Clicking the previous color should reset to that color

qgis · Sep 30, 2014 · fd92dd9 · fd92dd9
1 parent fb7415c
commit fd92dd9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/python/gui/qgscolorwidgets.sip b/python/gui/qgscolorwidgets.sip
@@ -421,6 +421,9 @@ class QgsColorPreviewWidget : QgsColorWidget
     //reimplemented to allow dragging colors
     void mousePressEvent( QMouseEvent* e );
 
+    //reimplemented to click colors
+    void mouseReleaseEvent( QMouseEvent* e );
+
     //reimplemented to allow dragging colors
     void mouseMoveEvent( QMouseEvent *e );
 

diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp
@@ -1591,6 +1591,30 @@ void QgsColorPreviewWidget::mousePressEvent( QMouseEvent *e )
   QWidget::mousePressEvent( e );
 }
 
+void QgsColorPreviewWidget::mouseReleaseEvent( QMouseEvent *e )
+{
+  if (( e->pos() - mDragStartPosition ).manhattanLength() >= QApplication::startDragDistance() )
+  {
+    //mouse moved, so a drag. nothing to do here
+    QWidget::mouseReleaseEvent( e );
+    return;
+  }
+
+  //work out which color was clicked
+  QColor clickedColor = mCurrentColor;
+  if ( mColor2.isValid() )
+  {
+    //two color sections, check if dragged color was the second color
+    int verticalSplit = qRound( height() / 2.0 );
+    if ( mDragStartPosition.y() >= verticalSplit )
+    {
+      clickedColor = mColor2;
+    }
+  }
+  emit colorChanged( clickedColor );
+
+}
+
 void QgsColorPreviewWidget::mouseMoveEvent( QMouseEvent *e )
 {
   //handle dragging colors from button

diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h
@@ -632,6 +632,9 @@ class GUI_EXPORT QgsColorPreviewWidget : public QgsColorWidget
     //reimplemented to allow dragging colors
     void mousePressEvent( QMouseEvent* e );
 
+    //reimplemented to click colors
+    void mouseReleaseEvent( QMouseEvent* e );
+
     //reimplemented to allow dragging colors
     void mouseMoveEvent( QMouseEvent *e );