From 2385b508d5f2db118513c3e0b343d2309cdfdcd8 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 12 Feb 2020 23:50:35 +0000 Subject: [PATCH 1/3] Bugfix: GUI: Only apply invalid style to QValidatedLineEdit, not its tooltip --- src/qt/qvalidatedlineedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 179ecdc8b3835..34489f3aac92b 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -28,7 +28,7 @@ void QValidatedLineEdit::setValid(bool _valid) } else { - setStyleSheet(STYLE_INVALID); + setStyleSheet("QValidatedLineEdit { " STYLE_INVALID "}"); } this->valid = _valid; } From b1a544be109d336c0b53722e3f8b51687972c94e Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 12 Feb 2020 23:53:41 +0000 Subject: [PATCH 2/3] Bugfix: GUI: Re-check validity after QValidatedLineEdit::setCheckValidator --- src/qt/qvalidatedlineedit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 34489f3aac92b..42fe172fa928b 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -106,6 +106,7 @@ void QValidatedLineEdit::checkValidity() void QValidatedLineEdit::setCheckValidator(const QValidator *v) { checkValidator = v; + checkValidity(); } bool QValidatedLineEdit::isValid() From aeb18b665c616c3326671b4c7e9d6421306564f0 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 13 Feb 2020 00:03:18 +0000 Subject: [PATCH 3/3] Bugfix: GUI: Check validity when QValidatedLineEdit::setText is called --- src/qt/qvalidatedlineedit.cpp | 6 ++++++ src/qt/qvalidatedlineedit.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 42fe172fa928b..6f5b629e765ad 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -15,6 +15,12 @@ QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) : connect(this, SIGNAL(textChanged(QString)), this, SLOT(markValid())); } +void QValidatedLineEdit::setText(const QString& text) +{ + QLineEdit::setText(text); + checkValidity(); +} + void QValidatedLineEdit::setValid(bool _valid) { if(_valid == this->valid) diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h index 66734cc9d4f97..4e6b4ec404b16 100644 --- a/src/qt/qvalidatedlineedit.h +++ b/src/qt/qvalidatedlineedit.h @@ -29,6 +29,7 @@ class QValidatedLineEdit : public QLineEdit const QValidator *checkValidator; public Q_SLOTS: + void setText(const QString&); void setValid(bool valid); void setEnabled(bool enabled);