Merge bitcoin-core/gui#153: Define MAX_DIGITS_BTC for magic number in BitcoinUnits::format

198fff88f385e090b57a0ee902719bcc22a6b86b GUI: Define MAX_DIGITS_BTC for magic number in BitcoinUnits::format (Luke Dashjr)

Pull request description:

  A magic number snuck in with https://github.com/bitcoin/bitcoin/pull/16432

ACKs for top commit:
  hebasto:
    ACK 198fff88f385e090b57a0ee902719bcc22a6b86b, I have reviewed the code and it looks OK, I agree it can be merged.
  kristapsk:
    utACK 198fff88f385e090b57a0ee902719bcc22a6b86b

Tree-SHA512: 78dc23c2ae61bac41e5e34eebf57274599cb2ebb0b18d46e8a3228d42b256a1bc9bb17091c748f0f692ef1c4c241cfbd3e30a12bcd12222a234c1a9547ebe786
This commit is contained in:
MarcoFalke 2020-12-17 10:53:31 +01:00 committed by pasta
parent 51fa0ed1a3
commit 64f0c3dc0b
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -11,6 +11,8 @@
#include <cassert> #include <cassert>
static constexpr auto MAX_DIGITS_BTC = 16;
BitcoinUnits::BitcoinUnits(QObject *parent): BitcoinUnits::BitcoinUnits(QObject *parent):
QAbstractListModel(parent), QAbstractListModel(parent),
unitlist(availableUnits()) unitlist(availableUnits())
@ -129,7 +131,9 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator
qint64 n_abs = (n > 0 ? n : -n); qint64 n_abs = (n > 0 ? n : -n);
qint64 quotient = n_abs / coin; qint64 quotient = n_abs / coin;
QString quotient_str = QString::number(quotient); QString quotient_str = QString::number(quotient);
if (justify) quotient_str = quotient_str.rightJustified(16 - num_decimals, ' '); if (justify) {
quotient_str = quotient_str.rightJustified(MAX_DIGITS_BTC - num_decimals, ' ');
}
// Use SI-style thin space separators as these are locale independent and can't be // Use SI-style thin space separators as these are locale independent and can't be
// confused with the decimal marker. // confused with the decimal marker.