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/05/20 06:56:36 UTC
[royale-asjs] branch develop updated: Don't have ApplicationLayout
hardwired into mx application.
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 652bcc3 Don't have ApplicationLayout hardwired into mx application.
new 41b9ea8 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/royale-asjs into develop
652bcc3 is described below
commit 652bcc3594cc3cb5c1dae2a3adbf7af89a60ce5b
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed May 20 09:53:27 2020 +0300
Don't have ApplicationLayout hardwired into mx application.
Reference #839.
---
frameworks/projects/MXRoyale/src/main/resources/defaults.css | 5 +++++
.../projects/MXRoyale/src/main/resources/mx-royale-manifest.xml | 1 +
frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as | 1 -
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 945702f..87a8e53 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -112,6 +112,11 @@ adg|AdvancedDataGridHeaderRenderer {
overflow: hidden;
}
+Application
+{
+ IBeadLayout: ClassReference("mx.containers.beads.ApplicationLayout");
+}
+
AdvancedDataGrid
{
alternatingItemColors: #F7F7F7, #FFFFFF;
diff --git a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index 45a65d6..a19a31e 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@ -54,6 +54,7 @@
<component id="ViewStack" class="mx.containers.ViewStack" />
<component id="TabNavigator" class="mx.containers.TabNavigator" />
<component id="ApplicationLayout" class="mx.containers.beads.ApplicationLayout" />
+ <component id="BasicLayout" class="mx.containers.beads.layouts.BasicLayout" />
<component id="BoxLayout" class="mx.containers.beads.BoxLayout" />
<component id="CanvasLayout" class="mx.containers.beads.CanvasLayout" />
<component id="TitleWindow" class="mx.containers.TitleWindow"/>
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
index 9f669f9..79bc0f7 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
@@ -315,7 +315,6 @@ public class Application extends Container implements IStrand, IParent, IEventDi
this.valuesImpl = new AllCSSValuesImpl();
addBead(new ContainerDataBinding()); // ApplicationDataBinding fires too soon
- addBead(new ApplicationLayout());
addBead(new ClassAliasBead());
instanceParent = this;