fixed text measurement regression (#978)

* fixed text measurement regression * also apply fix to UWP text * also applied fix to textinput
microsoft · Feb 10, 2017 · b4e5d8a · b4e5d8a
1 parent 1c48cc7
commit b4e5d8a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/ReactWindows/ReactNative.Net46/Views/Text/ReactTextShadowNode.cs b/ReactWindows/ReactNative.Net46/Views/Text/ReactTextShadowNode.cs
@@ -213,8 +213,8 @@ private static YogaSize MeasureText(ReactTextShadowNode textNode, YogaNode node,
                 var normalizedHeight = YogaConstants.IsUndefined(height) ? double.PositiveInfinity : height;
                 textBlock.Measure(new Size(normalizedWidth, normalizedHeight));
                 return MeasureOutput.Make(
-                    (float)textBlock.DesiredSize.Width,
-                    (float)textBlock.DesiredSize.Height);
+                    (float)Math.Ceiling(textBlock.DesiredSize.Width),
+                    (float)Math.Ceiling(textBlock.DesiredSize.Height));
             });
 
             return task.Result;

diff --git a/ReactWindows/ReactNative.Shared/Views/TextInput/ReactPasswordBoxShadowNode.cs b/ReactWindows/ReactNative.Shared/Views/TextInput/ReactPasswordBoxShadowNode.cs
@@ -258,7 +258,9 @@ private static YogaSize MeasureTextInput(ReactPasswordBoxShadowNode textInputNod
                 finalizedHeight += YogaConstants.IsUndefined(borderTopWidth) ? 0 : borderTopWidth;
                 finalizedHeight += YogaConstants.IsUndefined(borderBottomWidth) ? 0 : borderBottomWidth;
 
-                return MeasureOutput.Make(width, finalizedHeight);
+                return MeasureOutput.Make(
+                    (float)Math.Ceiling(width), 
+                    (float)Math.Ceiling(finalizedHeight));
             });
 
             return task.Result;

diff --git a/ReactWindows/ReactNative.Shared/Views/TextInput/ReactTextInputShadowNode.cs b/ReactWindows/ReactNative.Shared/Views/TextInput/ReactTextInputShadowNode.cs
@@ -319,7 +319,9 @@ private static YogaSize MeasureTextInput(ReactTextInputShadowNode textInputNode,
                 finalizedHeight += YogaConstants.IsUndefined(borderTopWidth) ? 0 : borderTopWidth;
                 finalizedHeight += YogaConstants.IsUndefined(borderBottomWidth) ? 0 : borderBottomWidth;
 
-                return MeasureOutput.Make(width, (float)finalizedHeight);
+                return MeasureOutput.Make(
+                    (float)Math.Ceiling(width), 
+                    (float)Math.Ceiling(finalizedHeight));
             });
 
             return task.Result;

diff --git a/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs b/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs
@@ -217,8 +217,8 @@ private static YogaSize MeasureText(ReactTextShadowNode textNode, YogaNode node,
                 var normalizedHeight = YogaConstants.IsUndefined(height) ? double.PositiveInfinity : height;
                 textBlock.Measure(new Size(normalizedWidth, normalizedHeight));
                 return MeasureOutput.Make(
-                    (float)textBlock.DesiredSize.Width,
-                    (float)textBlock.DesiredSize.Height);
+                    (float)Math.Ceiling(textBlock.DesiredSize.Width),
+                    (float)Math.Ceiling(textBlock.DesiredSize.Height));
             });
 
             return task.Result;