controll clear button by edit-state

because it has to appear on edit-mode, otherwise not cherry-picked from f0b0aea
qgis · Oct 30, 2018 · 47243dc · 47243dc
1 parent cb1172b
commit 47243dc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
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:
 
     /**