You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2020/11/30 08:48:18 UTC
[royale-asjs] branch develop updated: Fixes #962
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 73d8fa5 Fixes #962
new 8faa834 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
73d8fa5 is described below
commit 73d8fa5a103637451b3cf4bfe92b023743c842bd
Author: Yishay Weiss <yi...@hotmail.com>
AuthorDate: Mon Nov 30 10:47:37 2020 +0200
Fixes #962
---
.../projects/MXRoyale/src/main/royale/mx/containers/ViewStack.as | 2 ++
.../projects/MXRoyale/src/main/royale/mx/core/UIComponent.as | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/ViewStack.as b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/ViewStack.as
index c02fffe..8f1bdb4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/ViewStack.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/ViewStack.as
@@ -988,6 +988,7 @@ public class ViewStack extends Container implements /*IHistoryManagerClient,*/ I
COMPILE::JS
{
+ child.setIncludeInLayout(true); // Add current child to layout
// must set visible=true otherwise child has display:none
// and measurements of its children will not be correct
child.setVisible(true);
@@ -1209,6 +1210,7 @@ public class ViewStack extends Container implements /*IHistoryManagerClient,*/ I
{
var currentChild:UIComponent = UIComponent(getChildAt(lastIndex));
+ currentChild.setIncludeInLayout(false); // Remove current child from layout
currentChild.setVisible(false); // Hide the current child
/*
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 01eacd5..c2cc9d0 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -3112,6 +3112,14 @@ COMPILE::JS
/**
* @private
+ */
+ mx_internal function setIncludeInLayout(value:Boolean):void
+ {
+ _includeInLayout = value;
+ }
+
+ /**
+ * @private
* Storage for the includeInLayout property.
*/
private var _includeInLayout:Boolean = true;