[royale-asjs] branch ChildResize updated: More measurements happening, so need to check safety

[yishayw]

This is an automated email from the ASF dual-hosted git repository.

yishayw pushed a commit to branch ChildResize
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/ChildResize by this push:
     new 2874e45  More measurements happening, so need to check safety
     new 8d9bb55  Merge branch 'ChildResize' of 
https://github.com/apache/royale-asjs into ChildResize
2874e45 is described below

commit 2874e459c1ee1395f758ad87853843aa6667443f
Author: Yishay Weiss <yishayj...@hotmail.com>
AuthorDate: Thu Dec 10 15:35:37 2020 +0200

    More measurements happening, so need to check safety
---
 frameworks/projects/MXRoyale/src/main/royale/mx/containers/FormItem.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/FormItem.as 
b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/FormItem.as
index cf62562..6174d30 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/FormItem.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/FormItem.as
@@ -686,7 +686,7 @@ public class FormItem extends Container
         measuredWidth += extraWidth;
         
         // need to include label for height
-        var labelHeight:Number = labelObj.getExplicitOrMeasuredHeight();
+        var labelHeight:Number = labelObj ? 
labelObj.getExplicitOrMeasuredHeight() : 0;
         
         measuredMinHeight = Math.max(measuredMinHeight, labelHeight);
         measuredHeight = Math.max(measuredHeight, labelHeight);