Changes to Strings.autoFixed

Author: Anuken

arc-core/src/arc/util/Strings.java

@@ -1,6 +1,7 @@
 package arc.util;
 
 import arc.graphics.*;
+import arc.math.*;
 import arc.struct.*;
 
 import java.io.*;
@@ -576,9 +577,18 @@ public static float parseFloat(String s, float defaultValue){
     }
 
     public static String autoFixed(float value, int max){
-        int precision = Math.abs((int)(value + 0.0001f) - value) <= 0.0001f ? 0 :
-                Math.abs((int)(value * 10 + 0.0001f) - value * 10) <= 0.0001f ? 1 : 2;
-        return fixed(value, Math.min(precision, max));
+
+        //truncate extra digits past the max
+        value = (float)Mathf.floor(value * Mathf.pow(10, max) + 0.001f) / Mathf.pow(10, max);
+
+        int precision =
+                Math.abs(Mathf.floor(value) - value) < 0.0001f ? 0 :
+                Math.abs(Mathf.floor(value * 10) - value * 10) < 0.0001f ? 1 :
+                Math.abs(Mathf.floor(value * 100) - value * 100) < 0.0001f ? 2 :
+                Math.abs(Mathf.floor(value * 1000) - value * 1000) < 0.0001f ? 3 :
+                4;
+
+        return fixed(value, Math.min(max, precision));
     }
 
     public static String fixed(float d, int decimalPlaces){

arc-core/test/StringsTest.java

@@ -6,6 +6,28 @@
 
 public class StringsTest{
 
+    @Test
+    public void testFixed(){
+        Object[] values = {
+        3, 1.327f,  "1.327",
+        2, 1.327f,  "1.32",
+        1, 1.327f,  "1.3",
+        0, 1.327f,  "1",
+        3, 1.3005f, "1.3",
+        2, 0.0001f, "0",
+        4, 0.0001f, "0.0001",
+        3, 0.0001f, "0",
+        2, 2.435f, "2.43",
+        2, 2.99f, "2.99",
+        2, 2.99999f, "3",
+        2, 0f, "0"
+        };
+
+        for(int i = 0; i < values.length; i += 3){
+            assertEquals(values[i + 2], Strings.autoFixed((Float)values[i + 1], (Integer)values[i]));
+        }
+    }
+
     @Test
     public void testLongParse(){
         Seq.with("0", "+0", "-0", "235235", "99424", "1234", "1", "-24242", "170589", "-289157", "4246", "19284", "-672396", "-42412042040945", "1592835012852095")