summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2017-05-24 07:53:18 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2017-05-24 07:53:18 +0200
commit5277cc1270c7b4d5a14aec64b0d7c5090872156c (patch)
treed70d55e15e38d8501efcc25806787925fdd90710
parent2c1408ca1eb50c61bffd9f87f1a950ddfdcecb3e (diff)
Ommit trailing zeros in beat size spin box
-rw-r--r--src/widget/wbeatspinbox.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/widget/wbeatspinbox.cpp b/src/widget/wbeatspinbox.cpp
index b71856b8dd..762fbe9956 100644
--- a/src/widget/wbeatspinbox.cpp
+++ b/src/widget/wbeatspinbox.cpp
@@ -150,23 +150,14 @@ QString WBeatSpinBox::textFromValue(double value) const {
sFracPart = fractionString(29, 32);
} else if (dFracPart == 0.96875) {
sFracPart = fractionString(31, 32);
+ } else {
+ return locale().toString(value, 'g', 5);
}
if (dWholePart > 0) {
- if (sFracPart.isEmpty()) {
- if (dFracPart == 0.00000) {
- return locale().toString(dWholePart, 'f', 0);
- } else {
- return locale().toString(value, 'f', 5);
- }
- }
return locale().toString(dWholePart, 'f', 0) + " " + sFracPart;
- } else {
- if (sFracPart.isEmpty() ) {
- return locale().toString(value, 'f', 5);
- }
- return sFracPart;
}
+ return sFracPart;
}
double WBeatSpinBox::valueFromText(const QString& text) const {