Fixes value relation widget to always keep scrollbar activated. Fixes #16654

pblottiere · pblottiere · commit 7e4f1f8c95da · 2017-07-21T16:58:03.000+01:00
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h
@@ -122,7 +122,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
      *
      * \param enabled  Enable or Disable?
      */
-    void setEnabled( bool enabled ) override;
+    virtual void setEnabled( bool enabled ) override;
 
     /** Sets the widget to display in an indeterminate "mixed value" state.
      * \since QGIS 2.16
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -33,6 +33,7 @@ QgsValueRelationWidgetWrapper::QgsValueRelationWidgetWrapper( QgsVectorLayer *vl
   , mListWidget( nullptr )
   , mLineEdit( nullptr )
   , mLayer( nullptr )
+  , mUpdating( false )
 {
 }
 
@@ -198,3 +199,26 @@ void QgsValueRelationWidgetWrapper::showIndeterminateState()
     whileBlocking( mLineEdit )->clear();
   }
 }
+
+void QgsValueRelationWidgetWrapper::setEnabled( bool enabled )
+{
+  if ( mUpdating )
+    return;
+
+  if ( mListWidget )
+  {
+    mUpdating = true;
+    for ( int i = 0; i < mListWidget->count(); ++i )
+    {
+      QListWidgetItem *item = mListWidget->item( i );
+
+      if ( enabled )
+        item->setFlags( item->flags() | Qt::ItemIsEnabled );
+      else
+        item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
+    }
+    mUpdating = false;
+  }
+  else
+    QgsEditorWidgetWrapper::setEnabled( enabled );
+}
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h
@@ -59,6 +59,8 @@ class GUI_EXPORT QgsValueRelationWidgetWrapper : public QgsEditorWidgetWrapper
 
     void showIndeterminateState() override;
 
+    void setEnabled( bool enabled ) override;
+
   protected:
     QWidget *createWidget( QWidget *parent ) override;
     void initWidget( QWidget *editor ) override;
@@ -75,6 +77,8 @@ class GUI_EXPORT QgsValueRelationWidgetWrapper : public QgsEditorWidgetWrapper
     QgsValueRelationFieldFormatter::ValueRelationCache mCache;
     QgsVectorLayer *mLayer = nullptr;
 
+    bool mUpdating;
+
     friend class QgsValueRelationWidgetFactory;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper`
`122`	`122`	`*`
`123`	`123`	`* \param enabled Enable or Disable?`
`124`	`124`	`*/`
`125`		`- void setEnabled( bool enabled ) override;`
	`125`	`+ virtual void setEnabled( bool enabled ) override;`
`126`	`126`
`127`	`127`	`/** Sets the widget to display in an indeterminate "mixed value" state.`
`128`	`128`	`* \since QGIS 2.16`