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/03/17 07:30:59 UTC
[royale-asjs] branch develop updated: fix fixed size panel
This is an automated email from the ASF dual-hosted git repository.
aharui 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 bcb96db fix fixed size panel
bcb96db is described below
commit bcb96db04c2658289b0d05d19497937b68e5b4bb
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Mar 17 00:30:39 2020 -0700
fix fixed size panel
---
.../src/main/royale/mx/containers/beads/PanelInternalContainerView.as | 2 ++
.../projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as | 2 ++
2 files changed, 4 insertions(+)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelInternalContainerView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelInternalContainerView.as
index 955c5d6..a42cadc 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelInternalContainerView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelInternalContainerView.as
@@ -89,6 +89,8 @@ public class PanelInternalContainerView extends org.apache.royale.html.beads.Con
{
var container:Container = host as Container;
var panel:Container = container.parent as Container;
+ if (!isNaN(panel.explicitWidth) && !isNaN(panel.explicitHeight))
+ return true;
if (!panel.isWidthSizedToContent() || !panel.isHeightSizedToContent())
{
return sawSizeChanged;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as
index c364279..280c656 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as
@@ -154,6 +154,8 @@ public class PanelView extends org.apache.royale.html.beads.PanelView
override public function beforeLayout():Boolean
{
var panel:Container = host as Container;
+ if (!isNaN(panel.explicitWidth) && !isNaN(panel.explicitHeight))
+ return true;
if (!panel.isWidthSizedToContent() || !panel.isHeightSizedToContent())
{
return sawSizeChanged;