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/12/03 10:26:23 UTC
[royale-asjs] branch develop updated: jewel-buttonbar: add jewel
ButtonBarModel that extends from ArrayListSelectionModel
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 e4fa839 jewel-buttonbar: add jewel ButtonBarModel that extends from ArrayListSelectionModel
e4fa839 is described below
commit e4fa839997c368e3d78923dfea2aaf1669fbe61b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Dec 3 11:26:10 2020 +0100
jewel-buttonbar: add jewel ButtonBarModel that extends from ArrayListSelectionModel
---
.../src/main/royale/ButtonBarPlayGround.mxml | 2 +-
.../projects/Jewel/src/main/resources/defaults.css | 2 +-
.../Jewel/src/main/resources/jewel-manifest.xml | 2 +
.../royale/org/apache/royale/jewel/ButtonBar.as | 14 ++--
.../royale/jewel/beads/layouts/ButtonBarLayout.as | 4 +-
.../jewel/beads/layouts/DataGridColumnLayout.as | 4 +-
.../royale/jewel/beads/layouts/DataGridLayout.as | 6 +-
.../royale/jewel/beads/models/ButtonBarModel.as | 97 ++++++++++++++++++++++
.../Jewel/src/main/sass/components/_buttonbar.sass | 2 +-
9 files changed, 116 insertions(+), 17 deletions(-)
diff --git a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 99072dc..135a0c2 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -172,7 +172,7 @@ limitations under the License.
<![CDATA[
import org.apache.royale.core.ISelectable;
import org.apache.royale.events.Event;
- import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.beads.models.ButtonBarModel;
public function tbbChangeHandler(event:Event):void
{
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 6019bc1..e278045 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -274,7 +274,7 @@ j|Alert {
}
j|ButtonBar {
- IBeadModel: ClassReference("org.apache.royale.html.beads.models.ButtonBarModel");
+ IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ButtonBarModel");
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");
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 19e21a7..dba5149 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -120,6 +120,8 @@
<component id="HorizontalListScroll" class="org.apache.royale.jewel.beads.controls.list.HorizontalListScroll"/>
<component id="VirtualListView" class="org.apache.royale.jewel.beads.views.VirtualListView"/>
+ <component id="ButtonBarModel" class="org.apache.royale.jewel.beads.models.ButtonBarModel"/>
+
<component id="ButtonBar" class="org.apache.royale.jewel.ButtonBar"/>
<component id="IconButtonBar" class="org.apache.royale.jewel.IconButtonBar"/>
<component id="ToggleButtonBar" class="org.apache.royale.jewel.ToggleButtonBar"/>
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 97f3797..95c8f2e 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
@@ -23,7 +23,7 @@ package org.apache.royale.jewel
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
- import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.beads.models.ButtonBarModel;
/**
* The Jewel ButtonBar class is a component that displays a set of Buttons. The ButtonBar
@@ -68,20 +68,20 @@ package org.apache.royale.jewel
}
/**
- * @see org.apache.royale.html.beads.models.ButtonBarModel#buttonWidths
+ * @see org.apache.royale.jewel.beads.models.ButtonBarModel#buttonWidths
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
public function get buttonWidths():Array
{
return ButtonBarModel(model).buttonWidths;
}
/**
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
public function set buttonWidths(value:Array):void
{
@@ -89,20 +89,20 @@ package org.apache.royale.jewel
}
/**
- * @see org.apache.royale.html.beads.models.ButtonBarModel#widthType
+ * @see org.apache.royale.jewel.beads.models.ButtonBarModel#widthType
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
// public function get widthType():Number
// {
// return ButtonBarModel(model).widthType;
// }
/**
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
// public function set widthType(value:Number):void
// {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as
index c4f148b..9c71f62 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as
@@ -23,7 +23,7 @@ package org.apache.royale.jewel.beads.layouts
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IStyleableObject;
import org.apache.royale.events.Event;
- import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.beads.models.ButtonBarModel;
/**
* The Jewel ButtonBarLayout class bead sizes and positions the button
@@ -141,7 +141,7 @@ package org.apache.royale.jewel.beads.layouts
* @copy org.apache.royale.core.IBeadLayout#layout
* @royaleignorecoercion org.apache.royale.core.ILayoutChild
* @royaleignorecoercion org.apache.royale.core.IStrand
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
override public function layout():Boolean
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridColumnLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridColumnLayout.as
index 9ff8897..2d76631 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridColumnLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridColumnLayout.as
@@ -27,7 +27,7 @@ package org.apache.royale.jewel.beads.layouts
import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.html.beads.IDataGridView;
- import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.beads.models.ButtonBarModel;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnWidth;
/**
@@ -136,7 +136,7 @@ package org.apache.royale.jewel.beads.layouts
* @copy org.apache.royale.core.IBeadLayout#layout
* @royaleignorecoercion org.apache.royale.core.ILayoutChild
* @royaleignorecoercion org.apache.royale.core.IStrand
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
override public function layout():Boolean
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
index 40eb364..79fbd92 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
@@ -27,7 +27,7 @@ package org.apache.royale.jewel.beads.layouts
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.IDataGridView;
- import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.beads.models.ButtonBarModel;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnWidth;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridWidthDenominator;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
@@ -91,7 +91,7 @@ package org.apache.royale.jewel.beads.layouts
*
* @royaleignorecoercion org.apache.royale.core.IUIBase
* @royaleignorecoercion org.apache.royale.html.beads.IDataGridView
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
*/
private function sizeChangedNeeded(event:Event):void
{
@@ -125,7 +125,7 @@ package org.apache.royale.jewel.beads.layouts
* @royaleignorecoercion org.apache.royale.core.IUIBase
* @royaleignorecoercion org.apache.royale.core.UIBase
* @royaleignorecoercion org.apache.royale.html.beads.IDataGridView
- * @royaleignorecoercion org.apache.royale.html.beads.models.ButtonBarModel
+ * @royaleignorecoercion org.apache.royale.jewel.beads.models.ButtonBarModel
* @royaleignorecoercion org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn
*/
public function layout():Boolean
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ButtonBarModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ButtonBarModel.as
new file mode 100644
index 0000000..a10bdd2
--- /dev/null
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ButtonBarModel.as
@@ -0,0 +1,97 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.models
+{
+ import org.apache.royale.events.Event;
+
+ /**
+ * The ArraySelectionModel class is a selection model for
+ * a dataProvider that is an ArrayList. It assumes that items
+ * can be fetched from the dataProvider.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ public class ButtonBarModel extends ArrayListSelectionModel
+ {
+ public static const PIXEL_WIDTHS:Number = 0;
+ public static const PROPORTIONAL_WIDTHS:Number = 1;
+ public static const PERCENT_WIDTHS:Number = 2;
+ public static const NATURAL_WIDTHS:Number = 3;
+
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ public function ButtonBarModel()
+ {
+ }
+
+ private var _buttonWidths:Array = null;
+
+ /**
+ * The widths of each button. This property may be null (the default) in which
+ * case the buttons are equally sized. Or this array may contain values, one per
+ * button, which either indicate each button's width in pixels (set .widthType
+ * to ButtonBarModel.PIXEL_WIDTHS) or proportional to other buttons (set
+ * .widthType to ButtonBarModel.PROPORTIONAL_WIDTHS). The array can also contain
+ * specific percentages (set .widthType to ButtonBarModel.PERCENT_WIDTHS). If
+ * this array is set, the number of entries must match the number of buttons.
+ * However, any entry may be null to indicate the button's default size is to be used.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ public function get buttonWidths():Array
+ {
+ return _buttonWidths;
+ }
+ public function set buttonWidths(value:Array):void
+ {
+ _buttonWidths = value;
+ dispatchEvent(new Event("buttonWidthsChanged"));
+ }
+
+ private var _widthType:Number = ButtonBarModel.PIXEL_WIDTHS;
+
+ /**
+ * Indicates how to interpret the values of the buttonWidths array.
+ *
+ * PIXEL_WIDTHS: all of the values are exact pixel widths (unless a value is null).
+ * PROPORTIONAL_WIDTHS: all of the values are proportions. Use 1 to indicate normal, 2 to be 2x, etc. Use 0 (or null) to mean fixed default size.
+ */
+ public function get widthType():Number
+ {
+ return _widthType;
+ }
+ public function set widthType(value:Number):void
+ {
+ _widthType = value;
+ dispatchEvent(new Event("widthTypeChanged"));
+ }
+ }
+}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
index 64ff363..89545fa 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_buttonbar.sass
@@ -35,7 +35,7 @@ $border-radius: .25rem
border-bottom-right-radius: $border-radius
j|ButtonBar
- IBeadModel: ClassReference("org.apache.royale.html.beads.models.ButtonBarModel")
+ IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ButtonBarModel")
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")