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

[android] Cache font size and canvas diagonal. Reuse reactTag value.

Browse Source
This commit is contained in:
Mikael Sand
2018-10-14 18:40:15 +03:00
parent bd50941204
commit 2f1d6e1b7c
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/RenderableViewManager.java
+2 -2
View File
@@ -1075,8 +1075,8 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
view.dropView();
}
void setShadowNode(T virtualNode) {
mTagToShadowNode.put(virtualNode.getReactTag(), virtualNode);
void setShadowNode(int reactTag, T virtualNode) {
mTagToShadowNode.put(reactTag, virtualNode);
}
T getShadowNodeByTag(int id) {
android/src/main/java/com/horcrux/svg/VirtualNode.java
+22 -6
View File
@@ -47,7 +47,7 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
@Override
public void setReactTag(int reactTag) {
super.setReactTag(reactTag);
vm.setShadowNode(this);
vm.setShadowNode(reactTag, this);
}
RenderableViewManager<VirtualNode<T>> vm;
@@ -78,6 +78,8 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
private SvgViewShadowNode mSvgShadowNode;
private Path mCachedClipPath;
private GroupShadowNode mTextRoot;
private double fontSize = -1;
private double canvasDiagonal = -1;
private float canvasHeight = -1;
private float canvasWidth = -1;
private GlyphContext glyphContext;
@@ -112,8 +114,10 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
}
private void clearPath() {
canvasDiagonal = -1;
canvasHeight = -1;
canvasWidth = -1;
fontSize = -1;
mRegion = null;
mPath = null;
}
@@ -164,6 +168,9 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
private double getFontSizeFromContext() {
if (fontSize != -1) {
return fontSize;
}
GroupShadowNode root = getTextRoot();
if (root == null) {
return DEFAULT_FONT_SIZE;
@@ -173,7 +180,9 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
glyphContext = root.getGlyphContext();
}
return glyphContext.getFontSize();
fontSize = glyphContext.getFontSize();
return fontSize;
}
abstract void draw(Canvas canvas, Paint paint, float opacity);
@@ -342,10 +351,7 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
}
double relativeOnOther(String length) {
double powX = Math.pow((getCanvasWidth()), 2);
double powY = Math.pow((getCanvasHeight()), 2);
double r = Math.sqrt(powX + powY) * M_SQRT1_2l;
return PropHelper.fromRelative(length, r, 0, mScale, getFontSizeFromContext());
return PropHelper.fromRelative(length, getCanvasDiagonal(), 0, mScale, getFontSizeFromContext());
}
private float getCanvasWidth() {
@@ -376,6 +382,16 @@ abstract class VirtualNode<T> extends LayoutShadowNode {
return canvasHeight;
}
private double getCanvasDiagonal() {
if (canvasDiagonal != -1) {
return canvasDiagonal;
}
double powX = Math.pow((getCanvasWidth()), 2);
double powY = Math.pow((getCanvasHeight()), 2);
canvasDiagonal = Math.sqrt(powX + powY) * M_SQRT1_2l;
return canvasDiagonal;
}
void saveDefinition() {
if (mName != null) {
getSvgShadowNode().defineTemplate(this, mName);