temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-21 19:53:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Paint: Support Typeface (#1459)

Browse Source 
* Paint: Support Typeface

* Paint: Undo textSize transform
This commit is contained in:
Constantin Piber
2025-06-22 16:38:09 +02:00
committed by GitHub
parent 1cdef5e0ee
commit 972137c035
2 changed files with 341 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AndroidCompat/src/main/java/android/graphics/Paint.java
View File

@@ -49,7 +49,6 @@ public class Paint {
private MaskFilter mMaskFilter;
private PathEffect mPathEffect;
private Shader mShader;
private Typeface mTypeface;
private Xfermode mXfermode;
private boolean mHasCompatScaling;
@@ -264,7 +263,6 @@ public class Paint {
mMaskFilter = null;
mPathEffect = null;
mShader = null;
mTypeface = null;
mXfermode = null;
mHasCompatScaling = false;
@@ -299,7 +297,6 @@ public class Paint {
mMaskFilter = paint.mMaskFilter;
mPathEffect = paint.mPathEffect;
mShader = paint.mShader;
mTypeface = paint.mTypeface;
mXfermode = paint.mXfermode;
mHasCompatScaling = paint.mHasCompatScaling;
@@ -371,6 +368,12 @@ public class Paint {
fontAttributes.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_REGULAR);
}
Map<TextAttribute, Object> atts = (Map<TextAttribute, Object>) mFont.getAttributes();
Object weight = atts.getOrDefault(TextAttribute.WEIGHT, null);
if (weight instanceof Float) {
fontAttributes.put(TextAttribute.WEIGHT, weight);
}
mFont = mFont.deriveFont(fontAttributes);
}
@@ -602,11 +605,16 @@ public class Paint {
}
public Typeface getTypeface() {
return mTypeface;
return new Typeface(mFont);
}
public Typeface setTypeface(Typeface typeface) {
mTypeface = typeface;
Map<TextAttribute, Object> fontAttributes = new HashMap<TextAttribute, Object>();
fontAttributes.put(TextAttribute.WEIGHT, typeface.getJavaWeight());
mFont = typeface.getFont()
.deriveFont(mFont.getStyle(), mFont.getSize())
.deriveFont(fontAttributes);
setFlags(mFlags);
return typeface;
}
@@ -694,9 +702,7 @@ public class Paint {
}
public void setTextSize(float textSize) {
// convert px to pt using default DPI of 96
float fontSize = 72.0f * textSize / 96.0f;
mFont = mFont.deriveFont(fontSize);
mFont = mFont.deriveFont(textSize);
}
public float getTextScaleX() {