the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves style issues in CustomTypefaceSpan

Browse Source 
When two or more `CustomTypefaceSpan` are applied on a same character
sequence, previous `TextPaint`'s style was not respected.

Example:
--------
**Strong Emphasis _strong emphasis and emphasis combined_**

Before the inner text will only have the font applied without respecting
that the outer text is strong.

Related [bug report](https://issuetracker.google.com/issues/169658958)
on Google:
This commit is contained in:
Cyrus Bakhtiari-Haftlang 2020-09-30 09:26:56 +02:00 committed by Dimitry Ivanov
parent 7002dbfb8d
commit 89e89c766e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
markwon-core/src/main/java/io/noties/markwon/core/spans/CustomTypefaceSpan.java
View File

@ -1,5 +1,6 @@
package io.noties.markwon.core.spans; package io.noties.markwon.core.spans;
import android.annotation.SuppressLint;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.style.MetricAffectingSpan; import android.text.style.MetricAffectingSpan;
@ -34,11 +35,22 @@ public class CustomTypefaceSpan extends MetricAffectingSpan {
} }
@Override @Override
public void updateDrawState(TextPaint tp) { public void updateDrawState(@NonNull TextPaint tp) {
updatePaint(tp); updatePaint(tp);
} }
private void updatePaint(@NonNull TextPaint paint) { private void updatePaint(@NonNull TextPaint paint) {
paint.setTypeface(typeface); final Typeface old = paint.getTypeface();
final int oldStyle;
if (old == null) {
oldStyle = Typeface.NORMAL;
} else {
oldStyle = old.getStyle();
}
@SuppressLint("WrongConstant") final int want = oldStyle | typeface.getStyle();
final Typeface styledTypeface = Typeface.create(typeface, want);
paint.setTypeface(styledTypeface);
} }
} }