diff options
| author | Philip Kaufmann <[email protected]> | 2015-01-10 15:02:12 +0100 |
|---|---|---|
| committer | Philip Kaufmann <[email protected]> | 2015-01-10 15:02:12 +0100 |
| commit | 0fd9e2bf43d217d9a76003476661c8ab53606548 (patch) | |
| tree | a243e1438970ac6666c9547647898ef1b0fe6094 /src/qt/bitcoinamountfield.cpp | |
| parent | Merge pull request #5634 (diff) | |
| download | discoin-0fd9e2bf43d217d9a76003476661c8ab53606548.tar.xz discoin-0fd9e2bf43d217d9a76003476661c8ab53606548.zip | |
[Qt] don't allow amount changes when AmountSpinBox is read-only
- before it was possible to use the steps to change e.g. amouns of
authenticated or unauthenticated payment requests (AmountSpinBox is
already set to read-only here) - this is now fixed
- also move the reimplemented stepEnabled() function to the
protected section of our class, where it belongs (see Qt doc)
Diffstat (limited to 'src/qt/bitcoinamountfield.cpp')
| -rw-r--r-- | src/qt/bitcoinamountfield.cpp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index fdb9bcd6d..3e0ca0282 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -20,6 +20,7 @@ class AmountSpinBox: public QAbstractSpinBox { Q_OBJECT + public: explicit AmountSpinBox(QWidget *parent): QAbstractSpinBox(parent), @@ -72,23 +73,6 @@ public: setValue(val); } - StepEnabled stepEnabled() const - { - StepEnabled rv = 0; - if(text().isEmpty()) // Allow step-up with empty field - return StepUpEnabled; - bool valid = false; - CAmount val = value(&valid); - if(valid) - { - if(val > 0) - rv |= StepDownEnabled; - if(val < BitcoinUnits::maxMoney()) - rv |= StepUpEnabled; - } - return rv; - } - void setDisplayUnit(int unit) { bool valid = false; @@ -139,6 +123,7 @@ public: } return cachedMinimumSizeHint; } + private: int currentUnit; CAmount singleStep; @@ -179,6 +164,25 @@ protected: return QAbstractSpinBox::event(event); } + StepEnabled stepEnabled() const + { + StepEnabled rv = 0; + if (isReadOnly()) // Disable steps when AmountSpinBox is read-only + return StepNone; + if(text().isEmpty()) // Allow step-up with empty field + return StepUpEnabled; + bool valid = false; + CAmount val = value(&valid); + if(valid) + { + if(val > 0) + rv |= StepDownEnabled; + if(val < BitcoinUnits::maxMoney()) + rv |= StepUpEnabled; + } + return rv; + } + signals: void valueChanged(); }; |