You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/11 20:50:35 UTC
[royale-asjs] branch develop updated: jewel-buttonbar: refactor to
use Basic DataItemRendererFactoryForCollectionView and create its own
ButtonBarItemRendererInitializer
This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 9bc6f4f jewel-buttonbar: refactor to use Basic DataItemRendererFactoryForCollectionView and create its own ButtonBarItemRendererInitializer
9bc6f4f is described below
commit 9bc6f4fee07d3a64da6ded3d5f08356970f87b66
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Mar 11 21:50:25 2020 +0100
jewel-buttonbar: refactor to use Basic DataItemRendererFactoryForCollectionView and create its own ButtonBarItemRendererInitializer
---
.../projects/Jewel/src/main/resources/defaults.css | 4 +-
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 +
.../royale/org/apache/royale/jewel/ButtonBar.as | 3 +
.../ButtonBarItemRendererInitializer.as | 90 ++++++++++++++++++++++
.../royale/jewel/beads/views/ButtonBarView.as | 20 +----
.../jewel/itemRenderers/ButtonBarItemRenderer.as | 23 +-----
.../itemRenderers/IconButtonBarItemRenderer.as | 23 +-----
.../itemRenderers/ToggleButtonBarItemRenderer.as | 22 +-----
.../Jewel/src/main/sass/components/_buttonbar.sass | 4 +-
9 files changed, 103 insertions(+), 87 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 69d8523..1a40e16 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -277,10 +277,10 @@ j|ButtonBar {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ButtonBarView");
IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.ButtonBarLayout");
- IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView");
IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ButtonBarItemRenderer");
- IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.JewelListItemRendererInitializer");
+ IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ButtonBarItemRendererInitializer");
}
@media -royale-swf {
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 827b1e8..f834c2c 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -135,6 +135,7 @@ package
import org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListHoverOnlySelectableItemRendererBead; ClassSelectorListHoverOnlySelectableItemRendererBead;
import org.apache.royale.jewel.beads.itemRenderers.JewelListItemRendererInitializer; JewelListItemRendererInitializer;
+ import org.apache.royale.jewel.beads.itemRenderers.ButtonBarItemRendererInitializer; ButtonBarItemRendererInitializer;
import org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer; TabBarItemRendererInitializer;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
index 86b1744..18c26e7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
@@ -62,6 +62,9 @@ package org.apache.royale.jewel
super();
typeNames = "jewel buttonbar";
+
+ // default height and rowHeight
+ height = rowHeight = 38;
}
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as
new file mode 100644
index 0000000..39c5c32
--- /dev/null
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.jewel.beads.itemRenderers
+{
+ import org.apache.royale.core.IIndexedItemRenderer;
+ import org.apache.royale.core.IOwnerViewItemRenderer;
+ import org.apache.royale.core.StyledUIBase;
+ import org.apache.royale.core.UIBase;
+ import org.apache.royale.jewel.Button;
+ import org.apache.royale.jewel.ButtonBar;
+ import org.apache.royale.jewel.beads.views.ButtonBarView;
+
+ /**
+ * The ButtonBarItemRendererInitializer class initializes item renderers
+ * in ButtonBar component.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public class ButtonBarItemRendererInitializer extends ListItemRendererInitializer
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public function ButtonBarItemRendererInitializer()
+ {
+ }
+
+ override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
+ {
+ if (presentationModel) {
+ UIBase(ir).height = presentationModel.rowHeight;
+
+ if(ir is IAlignItemRenderer)
+ {
+ (ir as IAlignItemRenderer).align = presentationModel.align;
+ }
+ }
+ if (ir is IOwnerViewItemRenderer && ownerView)
+ (ir as IOwnerViewItemRenderer).itemRendererOwnerView = ownerView;
+ if (ir is Button && ownerView)
+ styleBasedOnIndex(ir);
+ }
+
+ public function styleBasedOnIndex(ir:IIndexedItemRenderer):void
+ {
+ var buttonBar:ButtonBar = ((ir as IOwnerViewItemRenderer).itemRendererOwnerView as ButtonBarView).buttonBar;
+ if(buttonBar.emphasis != null)
+ {
+ StyledUIBase(ir).emphasis = buttonBar.emphasis;
+ }
+
+ if(ir.index == 0)
+ {
+ StyledUIBase(ir).addClass("first");
+ }
+ else if(ir.index == buttonBar.dataProvider.length - 1 )
+ {
+ StyledUIBase(ir).addClass("last");
+ }
+ else
+ {
+ StyledUIBase(ir).addClass("middle");
+ }
+ }
+ }
+}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
index be73694..2db439e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
@@ -56,27 +56,11 @@ package org.apache.royale.jewel.beads.views
*/
public function get buttonBar():ButtonBar
{
- return _buttonBar;
+ return _strand as ButtonBar;
}
-
public function set buttonBar(value:ButtonBar):void
{
- _buttonBar = value;
- }
-
- /**
- * @copy org.apache.royale.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- override public function set strand(value:IStrand):void
- {
- super.strand = value;
- buttonBar = value as ButtonBar;
- buttonBar.height = buttonBar.rowHeight = 38;
+ _strand = value as ButtonBar;
}
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
index 7d64134..b54f7d0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
@@ -26,8 +26,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.Button;
- import org.apache.royale.jewel.ButtonBar;
- import org.apache.royale.jewel.beads.views.ButtonBarView;
/**
* The ButtonBarItemRenderer class extends Button and turns it into an itemRenderer
@@ -87,7 +85,7 @@ package org.apache.royale.jewel.itemRenderers
*/
private var _itemRendererOwnerView:IItemRendererOwnerView;
/**
- * The parent container for the itemRenderer instance.
+ * The parent container for the itemRenderer instance.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -101,12 +99,6 @@ package org.apache.royale.jewel.itemRenderers
public function set itemRendererOwnerView(value:IItemRendererOwnerView):void
{
_itemRendererOwnerView = value;
-
- var buttonBar:ButtonBar = (itemRendererOwnerView as ButtonBarView).buttonBar;
- if(buttonBar.emphasis != null)
- {
- emphasis = buttonBar.emphasis;
- }
}
private var _labelField:String = null;
@@ -168,19 +160,6 @@ package org.apache.royale.jewel.itemRenderers
public function set index(value:int):void
{
_index = value;
-
- if(_index == 0)
- {
- addClass("first");
- }
- else if( _index == (itemRendererOwnerView as ButtonBarView).buttonBar.dataProvider.length - 1 )
- {
- addClass("last");
- }
- else
- {
- addClass("middle");
- }
}
private var _selectable:Boolean = true;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
index 2e82692..f8798a0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
@@ -30,7 +30,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.jewel.IconButton;
import org.apache.royale.jewel.IconButtonBar;
import org.apache.royale.jewel.beads.views.ButtonBarView;
- import org.apache.royale.utils.IEmphasis;
/**
* The IconButtonBarItemRenderer class extends IconButton and turns it into an itemRenderer
@@ -99,7 +98,7 @@ package org.apache.royale.jewel.itemRenderers
*/
private var _itemRendererOwnerView:IItemRendererOwnerView;
/**
- * The parent container for the itemRenderer instance.
+ * The parent container for the itemRenderer instance.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -113,12 +112,6 @@ package org.apache.royale.jewel.itemRenderers
public function set itemRendererOwnerView(value:IItemRendererOwnerView):void
{
_itemRendererOwnerView = value;
-
- var buttonBar:IEmphasis = (itemRendererOwnerView as ButtonBarView).buttonBar;
- if(buttonBar.emphasis != null)
- {
- emphasis = buttonBar.emphasis;
- }
}
private var _labelField:String = null;
@@ -180,20 +173,6 @@ package org.apache.royale.jewel.itemRenderers
public function set index(value:int):void
{
_index = value;
-
- if(_index == 0)
- {
- addClass("first");
- }
- else if( _index == (itemRendererOwnerView as ButtonBarView).buttonBar.dataProvider.length - 1 )
- {
- addClass("last");
- }
- else
- {
- addClass("middle");
- }
}
-
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
index 107e201..3c14777 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ToggleButtonBarItemRenderer.as
@@ -27,7 +27,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.events.MouseEvent;
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.html.util.getLabelFromData;
- import org.apache.royale.jewel.ButtonBar;
import org.apache.royale.jewel.ToggleButton;
import org.apache.royale.jewel.ToggleButtonBar;
import org.apache.royale.jewel.beads.views.ButtonBarView;
@@ -99,7 +98,7 @@ package org.apache.royale.jewel.itemRenderers
*/
private var _itemRendererOwnerView:IItemRendererOwnerView;
/**
- * The parent container for the itemRenderer instance.
+ * The parent container for the itemRenderer instance.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -113,12 +112,6 @@ package org.apache.royale.jewel.itemRenderers
public function set itemRendererOwnerView(value:IItemRendererOwnerView):void
{
_itemRendererOwnerView = value;
-
- var buttonBar:ButtonBar = (itemRendererOwnerView as ButtonBarView).buttonBar;
- if(buttonBar.emphasis != null)
- {
- emphasis = buttonBar.emphasis;
- }
}
private var _labelField:String = null;
@@ -180,19 +173,6 @@ package org.apache.royale.jewel.itemRenderers
public function set index(value:int):void
{
_index = value;
-
- if(_index == 0)
- {
- addClass("first");
- }
- else if( _index == (itemRendererOwnerView as ButtonBarView).buttonBar.dataProvider.length - 1 )
- {
- addClass("last");
- }
- else
- {
- addClass("middle");
- }
}
private var _selectable:Boolean = true;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
index f658685..6d01725 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
@@ -39,10 +39,10 @@ j|ButtonBar
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ButtonBarView")
IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController")
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.ButtonBarLayout")
- IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView")
+ IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView")
IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory")
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ButtonBarItemRenderer")
- IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.JewelListItemRendererInitializer")
+ IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ButtonBarItemRendererInitializer")
@media -royale-swf
j|ButtonBar