From a4bae2051f22b31bdcd97de61f364f70f1d37ae7 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 29 Oct 2019 15:03:52 -0700 Subject: [PATCH] Remove trailing "0". Fixes #6 --- src/camount.cpp | 7 +++++-- src/mainwindow.ui | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/camount.cpp b/src/camount.cpp index c8cd723..1d50302 100644 --- a/src/camount.cpp +++ b/src/camount.cpp @@ -22,9 +22,12 @@ QString CAmount::toDecimalString() const { QString r = QString::number(wholePart); if (decimalPart > 0) { QString decimalPartStr = QString::number(decimalPart); - QString leadingZeros = QString("0").repeated(NUMPLACES - decimalPartStr.length()); + r = r + "." + decimalPartStr.rightJustified(NUMPLACES, '0'); - r = r + "." + leadingZeros + decimalPartStr; + // Trim tailing 0s + while (r.right(1) == "0") { + r = r.left(r.length() - 1); + } } return r; diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 5a9ac48..9e4a19d 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -22,7 +22,7 @@ - 3 + 1 @@ -296,7 +296,7 @@ false - From + false