Skip to content

Commit 5b443f3

Browse files
committed
[themes] Fix field expression widget not playing nice with themes
1 parent 90abfe2 commit 5b443f3

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

src/gui/qgsfieldexpressionwidget.cpp

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

7272
mCombo->installEventFilter( this );
73-
74-
mComboPalette = mCombo->lineEdit()->palette();
7573
}
7674

7775
void QgsFieldExpressionWidget::setExpressionDialogTitle( const QString &title )
@@ -338,10 +336,10 @@ void QgsFieldExpressionWidget::currentFieldChanged()
338336

339337
void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
340338
{
341-
QPalette palette( mComboPalette );
339+
QString stylesheet;
342340
if ( !isEnabled() )
343341
{
344-
palette.setColor( QPalette::Text, Qt::gray );
342+
stylesheet = QStringLiteral( "QLineEdit { color: %1; } Qt::gray );" ).arg( QColor( Qt::gray ).name() );
345343
}
346344
else
347345
{
@@ -361,10 +359,10 @@ void QgsFieldExpressionWidget::updateLineEditStyle( const QString &expression )
361359

362360
if ( isExpression && !isValid )
363361
{
364-
palette.setColor( QPalette::Text, Qt::red );
362+
stylesheet = QStringLiteral( "QLineEdit { color: %1; } Qt::gray );" ).arg( QColor( Qt::red ).name() );
365363
}
366364
}
367-
mCombo->lineEdit()->setPalette( palette );
365+
mCombo->lineEdit()->setStyleSheet( stylesheet );
368366
}
369367

370368
bool QgsFieldExpressionWidget::isExpressionValid( const QString &expressionStr )

src/gui/qgsfieldexpressionwidget.h

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

254253
friend class TestQgsFieldExpressionWidget;
255254
};

0 commit comments

Comments
 (0)