set value to null when pressed lineedit-clearbutton

cherry-picked from 713192f
qgis · Oct 30, 2018 · 1276671 · 1276671
1 parent 3ffdae1
commit 1276671
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -54,6 +54,7 @@ QgsFeatureListComboBox::QgsFeatureListComboBox( QWidget *parent )
 
   mLineEdit = new QgsFilterLineEdit();
   mLineEdit->setSelectOnFocus( true );
+  connect( mLineEdit, &QgsFilterLineEdit::cleared, this, &QgsFeatureListComboBox::setValueToNull );
   setEditable( true );
   setLineEdit( mLineEdit );
   setModel( mModel );
@@ -249,3 +250,9 @@ void QgsFeatureListComboBox::LineEditState::restore( QLineEdit *lineEdit ) const
   if ( selectionStart > -1 )
     lineEdit->setSelection( selectionStart, selectionLength );
 }
+
+void QgsFeatureListComboBox::setValueToNull()
+{
+  if ( allowNull() )
+    setCurrentIndex( nullIndex() );
+}
diff --git a/src/gui/qgsfeaturelistcombobox.h b/src/gui/qgsfeaturelistcombobox.h
@@ -200,6 +200,7 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
     void storeLineEditState();
     void restoreLineEditState();
     void onDataChanged( const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>() );
+    void setValueToNull();
 
   private:
     struct LineEditState