Fixes #54141 : increase expression widget text size for long expressions

troopa81 · nyalldawson · commit 044809cd46d3 · 2023-10-26T06:54:17.000+10:00
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -190,6 +190,11 @@ void QgsFieldExpressionWidget::setField( const QString &fieldName )
     return;
   }
 
+  if ( fieldName.size() > mCombo->lineEdit()->maxLength() )
+  {
+    mCombo->lineEdit()->setMaxLength( fieldName.size() );
+  }
+
   QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( fieldName );
   if ( !idx.isValid() )
   {
diff --git a/tests/src/gui/testqgsfieldexpressionwidget.cpp b/tests/src/gui/testqgsfieldexpressionwidget.cpp
@@ -49,6 +49,7 @@ class TestQgsFieldExpressionWidget : public QObject
     void testIsValid();
     void testFilters();
     void setNull();
+    void testVeryLongExpression();
 
   private:
     QgsFieldExpressionWidget *mWidget = nullptr;
@@ -372,5 +373,19 @@ void TestQgsFieldExpressionWidget::setNull()
   QgsProject::instance()->removeMapLayer( layer );
 }
 
+void TestQgsFieldExpressionWidget::testVeryLongExpression()
+{
+  QString veryLongExpression;
+  for ( int i = 0; i < 32770; i++ )
+  {
+    veryLongExpression += "a";
+  }
+
+  mWidget->setExpression( veryLongExpression );
+  QCOMPARE( veryLongExpression.size(), mWidget->currentText().size() );
+};
+
+
+
 QGSTEST_MAIN( TestQgsFieldExpressionWidget )
 #include "testqgsfieldexpressionwidget.moc"

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,11 @@ void QgsFieldExpressionWidget::setField( const QString &fieldName )`
`190`	`190`	`return;`
`191`	`191`	`}`
`192`	`192`
	`193`	`+ if ( fieldName.size() > mCombo->lineEdit()->maxLength() )`
	`194`	`+ {`
	`195`	`+ mCombo->lineEdit()->setMaxLength( fieldName.size() );`
	`196`	`+ }`
	`197`	`+`
`193`	`198`	`QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( fieldName );`
`194`	`199`	`if ( !idx.isValid() )`
`195`	`200`	`{`