Merge branch 'bugfix_qvalidlineedit' into gui_bech32_errpos

bitcoin-core · Jan 24, 2022 · 7e96673 · 7e96673
2 parents 9ec3991 + aeb18b6
commit 7e96673
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp
@@ -15,6 +15,12 @@ QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :
  connect(this, &QValidatedLineEdit::textChanged, this, &QValidatedLineEdit::markValid);
 }
 
+void QValidatedLineEdit::setText(const QString& text)
+{
+ QLineEdit::setText(text);
+ checkValidity();
+}
+
 void QValidatedLineEdit::setValid(bool _valid)
 {
  if(_valid == this->valid)
@@ -28,7 +34,7 @@ void QValidatedLineEdit::setValid(bool _valid)
  }
  else
  {
- setStyleSheet(STYLE_INVALID);
+ setStyleSheet("QValidatedLineEdit { " STYLE_INVALID "}");
  }
  this->valid = _valid;
 }
@@ -106,6 +112,7 @@ void QValidatedLineEdit::checkValidity()
 void QValidatedLineEdit::setCheckValidator(const QValidator *v)
 {
  checkValidator = v;
+ checkValidity();
 }
 
 bool QValidatedLineEdit::isValid()

diff --git 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);