sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nyall Dawson 2014-09-30 20:37:28 +10:00
parent fb7415c3ff
commit fd92dd95aa
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/gui/qgscolorwidgets.sip
View File

@ -421,6 +421,9 @@ class QgsColorPreviewWidget : QgsColorWidget
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
void mousePressEvent( QMouseEvent* e ); void mousePressEvent( QMouseEvent* e );
//reimplemented to click colors
void mouseReleaseEvent( QMouseEvent* e );
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
void mouseMoveEvent( QMouseEvent *e ); void mouseMoveEvent( QMouseEvent *e );

24
src/gui/qgscolorwidgets.cpp
View File

@ -1591,6 +1591,30 @@ void QgsColorPreviewWidget::mousePressEvent( QMouseEvent *e )
QWidget::mousePressEvent( 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 ) void QgsColorPreviewWidget::mouseMoveEvent( QMouseEvent *e )
{ {
//handle dragging colors from button //handle dragging colors from button

3
src/gui/qgscolorwidgets.h
View File

@ -632,6 +632,9 @@ class GUI_EXPORT QgsColorPreviewWidget : public QgsColorWidget
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
void mousePressEvent( QMouseEvent* e ); void mousePressEvent( QMouseEvent* e );
//reimplemented to click colors
void mouseReleaseEvent( QMouseEvent* e );
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
void mouseMoveEvent( QMouseEvent *e ); void mouseMoveEvent( QMouseEvent *e );