Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary cast to int in TextInlineView measure functions

Browse Source 
Summary:
This diff removes unnecessary (int) casts in the calculation of layout for TextInlineViews

changeLog: [Internal][Android] Internal optimization on the calculation of layout for TextInlineViews

Reviewed By: JoshuaGross

Differential Revision: D21211532

fbshipit-source-id: 920c1f88d042f3e1f6bfd0f560371f7482a62064
This commit is contained in:
David Vacca
2020-04-24 01:11:35 -07:00
committed by Facebook GitHub Bot
parent 025be8148a
commit 4ae2de211e
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+11 -12
View File
@@ -356,12 +356,12 @@ public class TextLayoutManager {
// thing to be truncated.
if (!(isLineTruncated && start >= layout.getLineStart(line) + layout.getEllipsisStart(line))
|| start >= layout.getLineEnd(line)) {
int placeholderWidth = placeholder.getWidth();
int placeholderHeight = placeholder.getHeight();
float placeholderWidth = placeholder.getWidth();
float placeholderHeight = placeholder.getHeight();
// Calculate if the direction of the placeholder character is Right-To-Left.
boolean isRtlChar = layout.isRtlCharAt(start);
boolean isRtlParagraph = layout.getParagraphDirection(line) == Layout.DIR_RIGHT_TO_LEFT;
int placeholderLeftPosition;
float placeholderLeftPosition;
// There's a bug on Samsung devices where calling getPrimaryHorizontal on
// the last offset in the layout will result in an endless loop. Work around
// this bug by avoiding getPrimaryHorizontal in that case.
@@ -370,8 +370,8 @@ public class TextLayoutManager {
isRtlParagraph
// Equivalent to `layout.getLineLeft(line)` but `getLineLeft` returns incorrect
// values when the paragraph is RTL and `setSingleLine(true)`.
? (int) calculatedWidth - (int) layout.getLineWidth(line)
: (int) layout.getLineRight(line) - placeholderWidth;
? calculatedWidth - layout.getLineWidth(line)
: layout.getLineRight(line) - placeholderWidth;
} else {
// The direction of the paragraph may not be exactly the direction the string is heading
// in at the
@@ -381,8 +381,8 @@ public class TextLayoutManager {
boolean characterAndParagraphDirectionMatch = isRtlParagraph == isRtlChar;
placeholderLeftPosition =
characterAndParagraphDirectionMatch
? (int) layout.getPrimaryHorizontal(start)
: (int) layout.getSecondaryHorizontal(start);
? layout.getPrimaryHorizontal(start)
: layout.getSecondaryHorizontal(start);
if (isRtlParagraph) {
// Adjust `placeholderLeftPosition` to work around an Android bug.
// The bug is when the paragraph is RTL and `setSingleLine(true)`, some layout
@@ -393,22 +393,21 @@ public class TextLayoutManager {
// The result is equivalent to bugless versions of
// `getPrimaryHorizontal`/`getSecondaryHorizontal`.
placeholderLeftPosition =
(int) calculatedWidth
- ((int) layout.getLineRight(line) - placeholderLeftPosition);
calculatedWidth - (layout.getLineRight(line) - placeholderLeftPosition);
}
if (isRtlChar) {
placeholderLeftPosition -= placeholderWidth;
}
}
// Vertically align the inline view to the baseline of the line of text.
int placeholderTopPosition = layout.getLineBaseline(line) - placeholderHeight;
float placeholderTopPosition = layout.getLineBaseline(line) - placeholderHeight;
int attachmentPosition = attachmentIndex * 2;
// The attachment array returns the positions of each of the attachments as
attachmentsPositions[attachmentPosition] =
(int) PixelUtil.toSPFromPixel(placeholderTopPosition);
(int) Math.ceil(PixelUtil.toSPFromPixel(placeholderTopPosition));
attachmentsPositions[attachmentPosition + 1] =
(int) PixelUtil.toSPFromPixel(placeholderLeftPosition);
(int) Math.ceil(PixelUtil.toSPFromPixel(placeholderLeftPosition));
attachmentIndex++;
}
}