Skip to content

Commit 89aa828

Browse files
committed
fix invisible text in field expression widget in dark themes
backport of #9701
1 parent ec8bfa8 commit 89aa828

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/gui/qgsfieldexpressionwidget.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ QgsFieldExpressionWidget::QgsFieldExpressionWidget( QWidget *parent )
7070
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() );
7171

7272
mCombo->installEventFilter( this );
73+
74+
mComboPalette = mCombo->lineEdit()->palette();
7375
}
7476

7577
void QgsFieldExpressionWidget::setExpressionDialogTitle( const QString &title )
@@ -336,7 +338,7 @@ void QgsFieldExpressionWidget::currentFieldChanged()
336338

337339
void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
338340
{
339-
QPalette palette = mCombo->lineEdit()->palette();
341+
QPalette palette( mComboPalette );
340342
if ( !isEnabled() )
341343
{
342344
palette.setColor( QPalette::Text, Qt::gray );
@@ -361,10 +363,6 @@ void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
361363
{
362364
palette.setColor( QPalette::Text, Qt::red );
363365
}
364-
else
365-
{
366-
palette.setColor( QPalette::Text, Qt::black );
367-
}
368366
}
369367
mCombo->lineEdit()->setPalette( palette );
370368
}

src/gui/qgsfieldexpressionwidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
249249
const QgsExpressionContextGenerator *mExpressionContextGenerator = nullptr;
250250
QString mBackupExpression;
251251
bool mAllowEvalErrors = false;
252+
QPalette mComboPalette;
252253

253254
friend class TestQgsFieldExpressionWidget;
254255
};

0 commit comments

Comments
 (0)