zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-04 07:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify manual kerning logic.

Browse Source
This commit is contained in:
Mikael Sand
2017-07-22 17:19:09 +03:00
parent f4779efe9b
commit ea17841eb5
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/GlyphContext.java
-3
View File
@@ -27,7 +27,6 @@ class GlyphContext {
private static final String FONT_WEIGHT = "fontWeight"; private static final String FONT_WEIGHT = "fontWeight";
private static final String FONT_FAMILY = "fontFamily"; private static final String FONT_FAMILY = "fontFamily";
private static final String LETTER_SPACING = "letterSpacing"; private static final String LETTER_SPACING = "letterSpacing";
private static final String IS_KERNING_VALUE_SET = "isKerningValueSet";
// Unique input attribute lists (only added if node sets a value) // Unique input attribute lists (only added if node sets a value)
private final ArrayList<String[]> mXsContext = new ArrayList<>(); private final ArrayList<String[]> mXsContext = new ArrayList<>();
@@ -355,7 +354,6 @@ class GlyphContext {
ReadableMap getFont() { ReadableMap getFont() {
WritableMap map = Arguments.createMap(); WritableMap map = Arguments.createMap();
map.putBoolean(IS_KERNING_VALUE_SET, false);
map.putDouble(FONT_SIZE, fontSize); map.putDouble(FONT_SIZE, fontSize);
boolean letterSpacingSet = false; boolean letterSpacingSet = false;
@@ -395,7 +393,6 @@ class GlyphContext {
if (!kerningSet && font.hasKey(KERNING)) { if (!kerningSet && font.hasKey(KERNING)) {
String kerningString = font.getString(KERNING); String kerningString = font.getString(KERNING);
float kerning = Float.valueOf(kerningString); float kerning = Float.valueOf(kerningString);
map.putBoolean(IS_KERNING_VALUE_SET, true);
map.putDouble(KERNING, kerning); map.putDouble(KERNING, kerning);
kerningSet = true; kerningSet = true;
} }
android/src/main/java/com/horcrux/svg/TSpanShadowNode.java
+1 -2
View File
@@ -49,7 +49,6 @@ class TSpanShadowNode extends TextShadowNode {
private static final String PROP_FONT_WEIGHT = "fontWeight"; private static final String PROP_FONT_WEIGHT = "fontWeight";
private static final String PROP_FONT_FAMILY = "fontFamily"; private static final String PROP_FONT_FAMILY = "fontFamily";
private static final String PROP_LETTER_SPACING = "letterSpacing"; private static final String PROP_LETTER_SPACING = "letterSpacing";
private static final String PROP_IS_KERNING_VALUE_SET = "isKerningValueSet";
private Path mCache; private Path mCache;
private @Nullable String mContent; private @Nullable String mContent;
@@ -161,7 +160,7 @@ class TSpanShadowNode extends TextShadowNode {
boolean autoKerning = true; boolean autoKerning = true;
float kerning = DEFAULT_KERNING; float kerning = DEFAULT_KERNING;
if (font.getBoolean(PROP_IS_KERNING_VALUE_SET)) { if (font.hasKey(PROP_KERNING)) {
kerning = (float) (font.getDouble(PROP_KERNING) * mScale); kerning = (float) (font.getDouble(PROP_KERNING) * mScale);
autoKerning = false; autoKerning = false;
} }