You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2021/01/04 12:48:52 UTC

[royale-asjs] branch develop updated: Fix IBeadView for Spark DataGroup, and add missing "implements ILayoutView" to Spark GroupBase.

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

harbs 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 4d2921c  Fix IBeadView for Spark DataGroup, and add missing "implements ILayoutView" to Spark GroupBase.
     new 942e1bb  Merge pull request #1033 from estanglerbm/spark-group-fixes
4d2921c is described below

commit 4d2921ce74323d0ca8bac680102c310920085913
Author: Edward Stangler <es...@bradmark.com>
AuthorDate: Mon Jan 4 06:10:40 2021 -0600

    Fix IBeadView for Spark DataGroup, and add missing "implements ILayoutView" to Spark GroupBase.
---
 frameworks/projects/SparkRoyale/src/main/resources/defaults.css       | 4 +---
 .../src/main/royale/spark/components/supportClasses/GroupBase.as      | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frameworks/projects/SparkRoyale/src/main/resources/defaults.css b/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
index 4ada209..e83a39c 100644
--- a/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/SparkRoyale/src/main/resources/defaults.css
@@ -70,7 +70,7 @@ DataGroup
 {
 	IDataProviderItemRendererMapper: ClassReference("mx.controls.listClasses.DataItemRendererFactoryForIListData");
 	IBeadModel: ClassReference("mx.controls.beads.models.SingleSelectionIListModel");
-	IBeadView:  ClassReference("org.apache.royale.html.beads.DataContainerView");			
+	IBeadView:  ClassReference("spark.components.beads.DataContainerView");			
 	IBeadLayout: ClassReference("spark.layouts.supportClasses.SparkLayoutBead");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("spark.components.beads.SelfItemRenderer");
@@ -295,14 +295,12 @@ TitleWindow
     {
 	    IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 	    IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-	    IContentView: ClassReference("org.apache.royale.html.supportClasses.ContainerContentArea");
     }
 
 	SkinnableDataContainer
 	{
 		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 	}
 
 	Label
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
index fabef3c..522a5f2 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
@@ -49,6 +49,7 @@ import org.apache.royale.core.IBeadLayout;
 import org.apache.royale.core.IContainer;
 import org.apache.royale.core.ILayoutHost;
 import org.apache.royale.core.ILayoutParent;
+import org.apache.royale.core.ILayoutView;
 import org.apache.royale.core.IParent;
 import org.apache.royale.core.ValuesManager;
 import org.apache.royale.events.Event;
@@ -333,7 +334,7 @@ include "../../styles/metadata/SelectionFormatTextStyles.as" */
  *  @playerversion AIR 1.5
  *  @productversion Royale 0.9.4
  */
-public class GroupBase extends UIComponent implements ILayoutParent, IContainer, IViewport
+public class GroupBase extends UIComponent implements ILayoutParent, ILayoutView, IContainer, IViewport
 {
 
     //--------------------------------------------------------------------------