Changeset d7e5aaf

Timestamp:

Mar 6, 2017 3:46:56 AM (3 years ago)

Author:

str4d <str4d@…>

Branches:

master

Children:

4bf0147

Parents:

10a021f

Message:

Replace   with thin non-breaking space   for byte sizes

The latter has more consistent/predictable width between fonts & point sizes.

Files:

• apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java (modified) (2 diffs)
• core/java/src/net/i2p/data/DataHelper.java (modified) (1 diff)

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -2566 +2566 @@
     private static String formatSize(long bytes) {
         if (bytes < 5000)
-            return bytes + "&nbsp;B";
+
+            // replace &nbsp; with narrow non-breaking space (&#8239;)
+            return bytes + "&#8239;B";
         else if (bytes < 5*1024*1024)
-            return ((bytes + 512)/1024) + "&nbsp;KB";
+            return ((bytes + 512)/1024) + "&#8239;KB";
         else if (bytes < 10*1024*1024*1024l)
-            return ((bytes + 512*1024)/(1024*1024)) + "&nbsp;MB";
+            return ((bytes + 512*1024)/(1024*1024)) + "&#8239;MB";
         else
-            return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "&nbsp;GB";
+            return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "&#8239;GB";
     }
     
@@ -2943 +2945 @@
                 double ratio = uploaded / ((double) snark.getTotalLength());
                 buf.append((new DecimalFormat("0.000")).format(ratio));
-                buf.append("&nbsp;x");
+                buf.append("&#8239;x");
             } else {
                 buf.append('0');

core/java/src/net/i2p/data/DataHelper.java

@@ -1561 +1561 @@
         DecimalFormat fmt = new DecimalFormat("##0.00");
 
+        // Replace   with thin non-breaking space   (more consistent/predictable width between fonts & point sizes)
+
         String str = fmt.format(val);
         switch (scale) {
-            case 1: return str + " K";
-            case 2: return str + " M";
-            case 3: return str + " G";
-            case 4: return str + " T";
-            case 5: return str + " P";
-            case 6: return str + " E";
-            case 7: return str + " Z";
-            case 8: return str + " Y";
-            default: return bytes + " ";
+            case 1: return str + " K";
+            case 2: return str + " M";
+            case 3: return str + " G";
+            case 4: return str + " T";
+            case 5: return str + " P";
+            case 6: return str + " E";
+            case 7: return str + " Z";
+            case 8: return str + " Y";
+            default: return bytes + " ";
         }
     }