echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace   with thin non-breaking space   for byte sizes

Browse Source 
The latter has more consistent/predictable width between fonts & point sizes.
This commit is contained in:
str4d
2017-03-06 03:46:56 +00:00
parent 10a021f5fc
commit d7e5aaf919
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -2565,13 +2565,15 @@ public class I2PSnarkServlet extends BasicServlet {
// rounding makes us look faster :) // rounding makes us look faster :)
private static String formatSize(long bytes) { private static String formatSize(long bytes) {
if (bytes < 5000) 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) 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) else if (bytes < 10*1024*1024*1024l)
return ((bytes + 512*1024)/(1024*1024)) + "&nbsp;MB"; return ((bytes + 512*1024)/(1024*1024)) + "&#8239;MB";
else else
return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "&nbsp;GB"; return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "&#8239;GB";
} }
/** /**
@ -2942,7 +2944,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (uploaded > 0) { if (uploaded > 0) {
double ratio = uploaded / ((double) snark.getTotalLength()); double ratio = uploaded / ((double) snark.getTotalLength());
buf.append((new DecimalFormat("0.000")).format(ratio)); buf.append((new DecimalFormat("0.000")).format(ratio));
buf.append("&nbsp;x"); buf.append("&#8239;x");
} else { } else {
buf.append('0'); buf.append('0');
} }

20
core/java/src/net/i2p/data/DataHelper.java
View File

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