You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2020/12/10 05:01:43 UTC
[royale-asjs] branch ChildResize updated: handle skins of
SkinnableContainers that are fully sized by parent
This is an automated email from the ASF dual-hosted git repository.
aharui 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 6c7c869 handle skins of SkinnableContainers that are fully sized by parent
6c7c869 is described below
commit 6c7c8696e9254c8ed0773969a39bd9e23caca430
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Dec 9 21:00:02 2020 -0800
handle skins of SkinnableContainers that are fully sized by parent
---
.../spark/components/beads/SkinnableContainerView.as | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/SkinnableContainerView.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/SkinnableContainerView.as
index 70f322f..4760290 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/SkinnableContainerView.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/beads/SkinnableContainerView.as
@@ -107,10 +107,18 @@ public class SkinnableContainerView extends SparkContainerView
{
host.skin.setLayoutBoundsSize(NaN, host.height);
host.measuredWidth = host.skin.measuredWidth;
- } else
+ }
+ else
{
- host.skin.setLayoutBoundsSize(host.width, NaN);
- host.measuredHeight = host.skin.measuredHeight;
+ if (host.isHeightSizedToContent())
+ {
+ host.skin.setLayoutBoundsSize(host.width, NaN);
+ host.measuredHeight = host.skin.measuredHeight;
+ }
+ else
+ {
+ host.skin.setLayoutBoundsSize(host.width, host.height);
+ }
}
}
else