controll clear button by edit-state

signedav · signedav · commit f0b0aea3b223 · 2018-10-25T13:56:57.000+02:00
because it has to appear on edit-mode, otherwise not
diff --git a/python/gui/auto_generated/qgsfeaturelistcombobox.sip.in b/python/gui/auto_generated/qgsfeaturelistcombobox.sip.in
@@ -125,6 +125,9 @@ The index of the currently selected item.
     virtual void keyPressEvent( QKeyEvent *event );
 
 
+    virtual bool event( QEvent *event );
+
+
   signals:
 
     void modelUpdated();
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -203,6 +203,14 @@ void QgsFeatureListComboBox::keyPressEvent( QKeyEvent *event )
   QComboBox::keyReleaseEvent( event );
 }
 
+bool QgsFeatureListComboBox::event( QEvent *event )
+{
+  if ( event->type() == QEvent::EnabledChange )
+    mLineEdit->setShowClearButton( true );
+
+  return QComboBox::event( event );;
+}
+
 bool QgsFeatureListComboBox::allowNull() const
 {
   return mModel->allowNull();
diff --git a/src/gui/qgsfeaturelistcombobox.h b/src/gui/qgsfeaturelistcombobox.h
@@ -147,6 +147,8 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
 
     void keyPressEvent( QKeyEvent *event ) override;
 
+    bool event( QEvent *event ) override;
+
   signals:
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,14 @@ void QgsFeatureListComboBox::keyPressEvent( QKeyEvent *event )`
`203`	`203`	`QComboBox::keyReleaseEvent( event );`
`204`	`204`	`}`
`205`	`205`
	`206`	`+bool QgsFeatureListComboBox::event( QEvent *event )`
	`207`	`+{`
	`208`	`+ if ( event->type() == QEvent::EnabledChange )`
	`209`	`+ mLineEdit->setShowClearButton( true );`
	`210`	`+`
	`211`	`+ return QComboBox::event( event );;`
	`212`	`+}`
	`213`	`+`
`206`	`214`	`bool QgsFeatureListComboBox::allowNull() const`
`207`	`215`	`{`
`208`	`216`	`return mModel->allowNull();`