msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Relative font sizes are required for zooming

Browse Source
pull/178/head
M66B 5 years ago
parent c0c322afc9
commit 4cbe6d8b3b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File

24
app/src/main/java/eu/faircode/email/HtmlHelper.java
Unescape View File

@ -35,7 +35,6 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.BulletSpan; import android.text.style.BulletSpan;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan; import android.text.style.ImageSpan;
@ -540,7 +539,7 @@ public class HtmlHelper {
if (!text_size) if (!text_size)
continue; continue;
Float current = null; float current = 1.0f;
Element parent = element.parent(); Element parent = element.parent();
while (parent != null) { while (parent != null) {
String xFontSize = parent.attr("x-font-size"); String xFontSize = parent.attr("x-font-size");
@ -552,8 +551,10 @@ public class HtmlHelper {
} }
Float fsize = getFontSize(value, current); Float fsize = getFontSize(value, current);
if (fsize != null && fsize != 0) if (fsize != null && fsize != 0) {
element.attr("x-font-size", Float.toString(fsize)); element.attr("x-font-size", Float.toString(fsize));
element.attr("x-font-size-rel", Float.toString(fsize / current));
}
break; break;
case "font-weight": case "font-weight":
@ -592,7 +593,7 @@ public class HtmlHelper {
//case "font-size": //case "font-size":
//case "line-height": //case "line-height":
if (element.parent() != null && !display_hidden) { if (element.parent() != null && !display_hidden) {
Float s = getFontSize(value, null); Float s = getFontSize(value, 1.0f);
if (s != null && s == 0) { if (s != null && s == 0) {
Log.i("Removing no height/width " + element.tagName()); Log.i("Removing no height/width " + element.tagName());
element.remove(); element.remove();
@ -613,7 +614,7 @@ public class HtmlHelper {
String[] v = value.split(" "); String[] v = value.split(" ");
for (int i = 0; i < v.length; i++) for (int i = 0; i < v.length; i++)
p[i] = getFontSize(v[i], null); p[i] = getFontSize(v[i], 1.0f);
if (v.length == 1) { if (v.length == 1) {
p[1] = p[0]; p[1] = p[0];
@ -1068,14 +1069,11 @@ public class HtmlHelper {
return null; return null;
} }
private static Float getFontSize(String value, Float current) { private static Float getFontSize(String value, float current) {
// https://developer.mozilla.org/en-US/docs/Web/CSS/font-size // https://developer.mozilla.org/en-US/docs/Web/CSS/font-size
if (TextUtils.isEmpty(value)) if (TextUtils.isEmpty(value))
return null; return null;
if (current == null)
current = 1.0f;
if (value.contains("calc") || if (value.contains("calc") ||
"auto".equals(value) || "auto".equals(value) ||
"initial".equals(value) || "initial".equals(value) ||
@ -1876,7 +1874,7 @@ public class HtmlHelper {
element = (Element) node; element = (Element) node;
element.attr("start-index", Integer.toString(ssb.length())); element.attr("start-index", Integer.toString(ssb.length()));
if (debug) if (debug)
ssb.append("[" + element.tagName() + "]"); ssb.append("[" + element.tagName() + ":" + element.attr("x-font-size-rel") + "]");
} else if (node instanceof TextNode) { } else if (node instanceof TextNode) {
tnode = (TextNode) node; tnode = (TextNode) node;
ssb.append(tnode.text()); ssb.append(tnode.text());
@ -1915,10 +1913,10 @@ public class HtmlHelper {
} }
// Apply calculated font size // Apply calculated font size
String xFontSize = element.attr("x-font-size"); String xFontSize = element.attr("x-font-size-rel");
if (!TextUtils.isEmpty(xFontSize)) { if (!TextUtils.isEmpty(xFontSize)) {
int size = Helper.dp2pixels(context, Math.round(Float.parseFloat(xFontSize) * DEFAULT_FONT_SIZE)); Float fsize = Float.parseFloat(xFontSize);
ssb.setSpan(new AbsoluteSizeSpan(size), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(new RelativeSizeSpan(fsize), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
// Apply element // Apply element

Write Preview
Loading…
Cancel
Save