WEffectParameterNameBase: adjust value decimals per range

mixxxdj · Nov 5, 2022 · 1d806e8 · 1d806e8
1 parent e34ed56
commit 1d806e8
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/widget/weffectparameternamebase.cpp b/src/widget/weffectparameternamebase.cpp
@@ -10,7 +10,8 @@
 namespace {
 const QString kMimeTextDelimiter = QStringLiteral("\n");
 // for rounding the value display to 2 decimals
-constexpr int kValDecimals = 100;
+constexpr int kVal2Decimals = 100;
+constexpr int kVal1Decimals = 10;
 } // anonymous namespace
 
 WEffectParameterNameBase::WEffectParameterNameBase(
@@ -75,14 +76,20 @@ void WEffectParameterNameBase::parameterUpdated() {
 }
 
 void WEffectParameterNameBase::showNewValue(double newValue) {
-    // TODO(ronso0) Trim decimals if value string is longer than X digits to
-    // prevent labels to expand.
-    double newValRounded =
-            std::ceil(newValue * kValDecimals) / kValDecimals;
+    int absVal = abs(static_cast<int>(round(newValue)));
+    double dispVal;
+    if (absVal < 100) { // Round to 2 decimals
+        dispVal = std::ceil(newValue * kVal2Decimals) / kVal2Decimals;
+    } else if (absVal < 1000) { // Round to 2 decimals
+        dispVal = std::ceil(newValue * kVal1Decimals) / kVal1Decimals;
+    } else if (absVal >= 1000) { // Show only integer part
+        dispVal = round(newValue);
+    }
+
     if (m_unitString.isEmpty()) {
-        setText(QString::number(newValRounded));
+        setText(QString::number(dispVal));
     } else {
-        setText(QString::number(newValRounded) + QChar(' ') + m_unitString);
+        setText(QString::number(dispVal) + QChar(' ') + m_unitString);
     }
     m_displayNameResetTimer.start();
 }