foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

Merge pull request #5637

Browse source 
80dd50c [Qt] group variables below initial if-clauses in AmountSpinBox::stepEnabled (Philip Kaufmann)
0fd9e2b [Qt] don't allow amount changes when AmountSpinBox is read-only (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2015-01-14 16:54:16 +01:00
commit eec81cbb80
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/qt/bitcoinamountfield.cpp
View file

@ -20,6 +20,7 @@
class AmountSpinBox: public QAbstractSpinBox class AmountSpinBox: public QAbstractSpinBox
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit AmountSpinBox(QWidget *parent): explicit AmountSpinBox(QWidget *parent):
QAbstractSpinBox(parent), QAbstractSpinBox(parent),
@ -72,23 +73,6 @@ public:
setValue(val); 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) void setDisplayUnit(int unit)
{ {
bool valid = false; bool valid = false;
@ -139,6 +123,7 @@ public:
} }
return cachedMinimumSizeHint; return cachedMinimumSizeHint;
} }
private: private:
int currentUnit; int currentUnit;
CAmount singleStep; CAmount singleStep;
@ -179,6 +164,26 @@ protected:
return QAbstractSpinBox::event(event); return QAbstractSpinBox::event(event);
} }
StepEnabled stepEnabled() const
{
if (isReadOnly()) // Disable steps when AmountSpinBox is read-only
return StepNone;
if (text().isEmpty()) // Allow step-up with empty field
return StepUpEnabled;
StepEnabled rv = 0;
bool valid = false;
CAmount val = value(&valid);
if(valid)
{
if(val > 0)
rv |= StepDownEnabled;
if(val < BitcoinUnits::maxMoney())
rv |= StepUpEnabled;
}
return rv;
}
signals: signals:
void valueChanged(); void valueChanged();
}; };