Fix #19465 - Don't delete expression when pressing enter in combo (#8134

)
qgis · Oct 8, 2018 · 556cddd · 556cddd
1 parent 4da2b80
commit 556cddd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in b/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in
@@ -224,6 +224,9 @@ updateLineEditStyle will re-style (color/font) the line edit depending on conten
     virtual void changeEvent( QEvent *event );
 
 
+    virtual bool eventFilter( QObject *watched, QEvent *event );
+
+
 };
 
 /************************************************************************

diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -15,6 +15,8 @@
 ***************************************************************************/
 
 #include <QHBoxLayout>
+#include <QObject>
+#include <QKeyEvent>
 
 #include "qgsapplication.h"
 #include "qgsfieldexpressionwidget.h"
@@ -62,12 +64,12 @@ QgsFieldExpressionWidget::QgsFieldExpressionWidget( QWidget *parent )
   connect( mButton, &QAbstractButton::clicked, this, &QgsFieldExpressionWidget::editExpression );
   connect( mFieldProxyModel, &QAbstractItemModel::modelAboutToBeReset, this, &QgsFieldExpressionWidget::beforeResetModel );
   connect( mFieldProxyModel, &QAbstractItemModel::modelReset, this, &QgsFieldExpressionWidget::afterResetModel );
-  // NW TODO - Fix in 2.6
-//  connect( mCombo->lineEdit(), SIGNAL( returnPressed() ), this, SIGNAL( returnPressed() ) );
 
   mExpressionContext = QgsExpressionContext();
   mExpressionContext << QgsExpressionContextUtils::globalScope()
                      << QgsExpressionContextUtils::projectScope( QgsProject::instance() );
+
+  mCombo->installEventFilter( this );
 }
 
 void QgsFieldExpressionWidget::setExpressionDialogTitle( const QString &title )
@@ -269,6 +271,20 @@ void QgsFieldExpressionWidget::afterResetModel()
   mCombo->lineEdit()->setText( mBackupExpression );
 }
 
+bool QgsFieldExpressionWidget::eventFilter( QObject *watched, QEvent *event )
+{
+  if ( watched == mCombo && event->type() == QEvent::KeyPress )
+  {
+    QKeyEvent *keyEvent = static_cast<QKeyEvent *>( event );
+    if ( keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return )
+    {
+      expressionEditingFinished();
+      return true;
+    }
+  }
+  return QObject::eventFilter( watched, event );
+}
+
 bool QgsFieldExpressionWidget::allowEvalErrors() const
 {
   return mAllowEvalErrors;

diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -216,6 +216,8 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
   protected:
     void changeEvent( QEvent *event ) override;
 
+    bool eventFilter( QObject *watched, QEvent *event ) override;
+
   private slots:
     void reloadLayer();