fix invisible text in field expression widget in dark themes (#9709)

backport of #9701
qgis · Apr 6, 2019 · 1956cf3 · 1956cf3
1 parent 530b5bf
commit 1956cf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -71,6 +71,8 @@ QgsFieldExpressionWidget::QgsFieldExpressionWidget( QWidget *parent )
                      << QgsExpressionContextUtils::projectScope( QgsProject::instance() );
 
   mCombo->installEventFilter( this );
+
+  mComboPalette = mCombo->lineEdit()->palette();
 }
 
 void QgsFieldExpressionWidget::setExpressionDialogTitle( const QString &title )
@@ -337,7 +339,7 @@ void QgsFieldExpressionWidget::currentFieldChanged()
 
 void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
 {
-  QPalette palette = mCombo->lineEdit()->palette();
+  QPalette palette( mComboPalette );
   if ( !isEnabled() )
   {
     palette.setColor( QPalette::Text, Qt::gray );
@@ -362,10 +364,6 @@ void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
     {
       palette.setColor( QPalette::Text, Qt::red );
     }
-    else
-    {
-      palette.setColor( QPalette::Text, Qt::black );
-    }
   }
   mCombo->lineEdit()->setPalette( palette );
 }

diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -249,6 +249,7 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
     const QgsExpressionContextGenerator *mExpressionContextGenerator = nullptr;
     QString mBackupExpression;
     bool mAllowEvalErrors = false;
+    QPalette mComboPalette;
 
     friend class TestQgsFieldExpressionWidget;
 };