background color on constraint fields reset on toggle edit

signedav · signedav · commit c2f68d6f7b3b · 2017-11-13T10:49:44.000+01:00
if editable, the backgroundcolor should be set according the constraint result
if not editable, the backgroundcolor should be empty anyway
so it has to be reseted when synchronizeEditableState...
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip b/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
@@ -266,6 +266,19 @@ class QgsEditorWidgetWrapper : QgsWidgetWrapper
  Will call the value() method to determine the emitted value
 %End
 
+    virtual void resetConstraintWidgetStatus( bool editable );
+%Docstring
+ It cleans background color (and any other style) in case the feature is not
+ editable. In case it is, it resets it to the stored constraint status.
+
+ This could be overwritten in subclasses in case individual widgets need other
+ behavior.
+
+ \param editable if editable or not
+
+.. versionadded:: 3.0
+%End
+
   protected:
 
     virtual void updateConstraintWidgetStatus( ConstraintResult status );
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -101,8 +101,19 @@ void QgsEditorWidgetWrapper::valueChanged()
   emit valueChanged( value() );
 }
 
+void QgsEditorWidgetWrapper::resetConstraintWidgetStatus( bool editable )
+{
+  if ( editable )
+    updateConstraintWidgetStatus( mConstraintResult );
+  else
+    widget()->setStyleSheet( QString() );
+}
+
 void QgsEditorWidgetWrapper::updateConstraintWidgetStatus( ConstraintResult constraintResult )
 {
+  //set the constraint result
+  mConstraintResult = constraintResult;
+
   switch ( constraintResult )
   {
     case ConstraintResultPass:
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h
@@ -283,6 +283,19 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
      */
     void valueChanged();
 
+    /**
+     * It cleans background color (and any other style) in case the feature is not
+     * editable. In case it is, it resets it to the stored constraint status.
+     *
+     * This could be overwritten in subclasses in case individual widgets need other
+     * behavior.
+     *
+     * \param editable if editable or not
+     *
+     * \since QGIS 3.0
+     */
+    virtual void resetConstraintWidgetStatus( bool editable );
+
   protected:
 
     /**
@@ -314,6 +327,9 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
     //! Contains the string explanation of why a constraint check failed
     QString mConstraintFailureReason;
 
+    //! The current constraint result
+    ConstraintResult mConstraintResult;
+
     int mFieldIdx;
     QgsFeature mFeature;
     mutable QVariant mDefaultValue; // Cache default value, we don't want to retrieve different serial numbers if called repeatedly
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -968,6 +968,8 @@ void QgsAttributeForm::synchronizeEnabledState()
     {
       mFormEditorWidgets.value( eww->fieldIdx() )->setConstraintResultVisibility( isEditable );
 
+      eww->resetConstraintWidgetStatus( isEditable );
+
       bool enabled = isEditable && fieldIsEditable( eww->fieldIdx() );
       ww->setEnabled( enabled );
 

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,19 @@ void QgsEditorWidgetWrapper::valueChanged()`
`101`	`101`	`emit valueChanged( value() );`
`102`	`102`	`}`
`103`	`103`
	`104`	`+void QgsEditorWidgetWrapper::resetConstraintWidgetStatus( bool editable )`
	`105`	`+{`
	`106`	`+ if ( editable )`
	`107`	`+ updateConstraintWidgetStatus( mConstraintResult );`
	`108`	`+ else`
	`109`	`+ widget()->setStyleSheet( QString() );`
	`110`	`+}`
	`111`	`+`
`104`	`112`	`void QgsEditorWidgetWrapper::updateConstraintWidgetStatus( ConstraintResult constraintResult )`
`105`	`113`	`{`
	`114`	`+ //set the constraint result`
	`115`	`+ mConstraintResult = constraintResult;`
	`116`	`+`
`106`	`117`	`switch ( constraintResult )`
`107`	`118`	`{`
`108`	`119`	`case ConstraintResultPass:`
Original file line number	Diff line number	Diff line change
`@@ -968,6 +968,8 @@ void QgsAttributeForm::synchronizeEnabledState()`
`968`	`968`	`{`
`969`	`969`	`mFormEditorWidgets.value( eww->fieldIdx() )->setConstraintResultVisibility( isEditable );`
`970`	`970`
	`971`	`+ eww->resetConstraintWidgetStatus( isEditable );`
	`972`	`+`
`971`	`973`	`bool enabled = isEditable && fieldIsEditable( eww->fieldIdx() );`
`972`	`974`	`ww->setEnabled( enabled );`
`973`	`975`