[royale-asjs] branch develop updated: Layout is set by view but measurment may be called earlier

[yi...@apache.org]

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new e7356d9  Layout is set by view but measurment may be called earlier
     new 1b6695c  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
e7356d9 is described below

commit e7356d983feedf3331cc440912caad4f3dc78960
Author: Yishay Weiss <yi...@hotmail.com>
AuthorDate: Tue Jan 5 10:30:52 2021 +0000

    Layout is set by view but measurment may be called earlier
---
 .../src/main/royale/spark/components/SkinnableContainer.as       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
index d4314df..42a085f 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
@@ -1019,8 +1019,13 @@ public class SkinnableContainer extends SkinnableContainerBase implements IConta
      */
     override protected function measure():void
     {
-            _layout.measure();
-            
+	    if (_layout)
+	    {
+		_layout.measure();
+	    } else
+	    {
+		super.measure();
+	    }
     }
 
     override protected function createChildren():void