You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2022/09/22 03:21:29 UTC

[royale-asjs] branch develop updated: Fix for mx Panel layout not sizing its ControlBar

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

gregdove 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 123bf0cde9 Fix for mx Panel layout not sizing its ControlBar
123bf0cde9 is described below

commit 123bf0cde95ee8830e17ebdc601c4ba860439b3b
Author: greg-dove <gr...@gmail.com>
AuthorDate: Thu Sep 22 15:20:31 2022 +1200

    Fix for mx Panel layout not sizing its ControlBar
---
 .../projects/MXRoyale/src/main/royale/mx/containers/beads/PanelView.as | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 71a7756288..9c94da138a 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
@@ -185,12 +185,13 @@ class PanelLayout extends LayoutBase
         if (panel.isHeightSizedToContent())
             h = content.height + 2 + titleBar.getExplicitOrMeasuredHeight();
         titleBar.setActualSize(w - 2, titleBar.getExplicitOrMeasuredHeight());
-        var contentHeight:Number = h - titleBar.height - 4 - (controlBar ? controlBar.height : 0);
+        var contentHeight:Number = h - titleBar.height - 4 - (controlBar ? controlBar.getExplicitOrMeasuredHeight() : 0);
         content.setActualSize(w - 2, contentHeight);
         content.move(0, titleBar.height + 1);
         if (controlBar)
         {
             controlBar.move(0, titleBar.height + 1 + contentHeight + 1);
+            controlBar.setActualSize(w-2, controlBar.getExplicitOrMeasuredHeight());
         }
         return false;
     }