This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch has in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a1da93c7d6900b941a5ef75c432b4064261690e1 Author: Alex Harui <[email protected]> AuthorDate: Sat Feb 15 20:31:51 2020 -0800 menubar is working in MXRoyale --- .../html/beads/IndexedItemRendererInitializer.as} | 11 ++----- .../html/beads/ListItemRendererInitializer.as | 35 +++------------------- .../MXRoyale/src/main/resources/defaults.css | 5 ++++ ...ataItemRendererFactoryForICollectionViewData.as | 2 +- .../DataItemRendererFactoryForIListData.as | 2 +- 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as similarity index 85% rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as index 409df36..7a984d0 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as @@ -42,7 +42,7 @@ package org.apache.royale.html.beads * @playerversion AIR 2.6 * @productversion Royale 0.0 */ - public class ListItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer + public class IndexedItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer { /** * constructor. @@ -52,11 +52,10 @@ package org.apache.royale.html.beads * @playerversion AIR 2.6 * @productversion Royale 0.0 */ - public function ListItemRendererInitializer() + public function IndexedItemRendererInitializer() { } - protected var presentationModel:IListPresentationModel; protected var dataProviderModel:IDataProviderModel; protected var labelField:String; @@ -73,7 +72,6 @@ package org.apache.royale.html.beads override public function set strand(value:IStrand):void { _strand = value; - presentationModel = (_strand as IStrandWithPresentationModel).presentationModel as IListPresentationModel; dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; labelField = dataProviderModel.labelField; } @@ -103,11 +101,6 @@ package org.apache.royale.html.beads protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void { - var style:SimpleCSSStyles = new SimpleCSSStyles(); - style.marginBottom = presentationModel.separatorThickness; - UIBase(ir).style = style; - UIBase(ir).height = presentationModel.rowHeight; - UIBase(ir).percentWidth = 100; } } diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as index 409df36..3cea766 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as @@ -42,7 +42,7 @@ package org.apache.royale.html.beads * @playerversion AIR 2.6 * @productversion Royale 0.0 */ - public class ListItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer + public class ListItemRendererInitializer extends IndexedItemRendererInitializer implements IIndexedItemRendererInitializer { /** * constructor. @@ -57,8 +57,6 @@ package org.apache.royale.html.beads } protected var presentationModel:IListPresentationModel; - protected var dataProviderModel:IDataProviderModel; - protected var labelField:String; /** * @copy org.apache.royale.core.IBead#strand @@ -72,36 +70,11 @@ package org.apache.royale.html.beads */ override public function set strand(value:IStrand):void { - _strand = value; + super.strand = value; presentationModel = (_strand as IStrandWithPresentationModel).presentationModel as IListPresentationModel; - dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; - labelField = dataProviderModel.labelField; } - - /** - * @private - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper - * @royaleignorecoercion org.apache.royale.core.IIndexedItemRenderer - */ - public function initializeItemRenderer(ir:IItemRenderer, data:Object):void - { - if (ir is ILabelFieldItemRenderer) - (ir as ILabelFieldItemRenderer).labelField = labelField; - - setupVisualsForItemRenderer(ir as IIndexedItemRenderer); - } - - /** - * @private - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper - */ - public function initializeIndexedItemRenderer(ir:IIndexedItemRenderer, data:Object, index:int):void - { - ir.index = index; - initializeItemRenderer(ir, data); - } - - protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void + + override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void { var style:SimpleCSSStyles = new SimpleCSSStyles(); style.marginBottom = presentationModel.separatorThickness; diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css index e6dc580..7459188 100644 --- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css +++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css @@ -118,6 +118,7 @@ adg|AdvancedDataGridColumnList { IBeadLayout: ClassReference("mx.controls.beads.layouts.AdvancedDataGridVirtualListVerticalLayout"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("mx.controls.advancedDataGridClasses.AdvancedDataGridItemRenderer"); + IItemRendererInitializer: ClassReference("org.apache.royale.html.beads.ListItemRendererInitializer"); IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport"); IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); border-style: none; @@ -271,6 +272,7 @@ List IDataProviderItemRendererMapper: ClassReference("mx.controls.listClasses.DataItemRendererFactoryForICollectionViewData"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("mx.controls.listClasses.ListItemRenderer"); + IItemRendererInitializer: ClassReference("org.apache.royale.html.beads.ListItemRendererInitializer"); IListPresentationModel: ClassReference("org.apache.royale.html.beads.models.ListPresentationModel"); IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport"); IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); @@ -301,6 +303,7 @@ MenuBar { IMenuFactory: ClassReference("org.apache.royale.html.beads.CascadingMenuFactory"); IDataProviderItemRendererMapper: ClassReference("mx.controls.listClasses.DataItemRendererFactoryForICollectionViewData"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory"); + IItemRendererInitializer: ClassReference("org.apache.royale.html.beads.IndexedItemRendererInitializer"); IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport"); IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); height: 30px; @@ -437,6 +440,7 @@ Tree IBeadModel: ClassReference("mx.controls.beads.models.SingleSelectionICollectionViewModel"); IBeadController: ClassReference("org.apache.royale.html.beads.controllers.TreeSingleSelectionMouseController"); IDataProviderItemRendererMapper: ClassReference("mx.controls.treeClasses.DataItemRendererFactoryForICollectionViewHierarchicalData"); + IItemRendererInitializer: ClassReference("mx.controls.beads.TreeItemRendererInitializer"); IItemRenderer: ClassReference("mx.controls.treeClasses.TreeItemRenderer"); } @@ -453,6 +457,7 @@ ToggleButtonBar IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController"); IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.ButtonBarLayout"); IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData"); + IItemRendererInitializer: ClassReference("org.apache.royale.html.beads.ListItemRendererInitializer"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.TextButtonItemRenderer"); diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForICollectionViewData.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForICollectionViewData.as index 1f0576d..ee6d141 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForICollectionViewData.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForICollectionViewData.as @@ -109,7 +109,7 @@ package mx.controls.listClasses // assumes will be called in a loop, not random access - override protected function dataProviderLength():int + override protected function get dataProviderLength():int { cursor = dp.createCursor(); return dp.length; diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForIListData.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForIListData.as index 1ce05a3..57afc1d 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForIListData.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForIListData.as @@ -105,7 +105,7 @@ package mx.controls.listClasses } - override protected function dataProviderLength():int + override protected function get dataProviderLength():int { return dp.length; }
