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 54bdc73 jewel-layouts: make itemsVerticalAlign accept "itemCenter"
(instead itemCentered that is different to horizontal option and can be
confusing)
54bdc73 is described below
commit 54bdc73de9b97c00da763e214117f689c7531649
Author: Carlos Rovira <[email protected]>
AuthorDate: Tue Mar 24 13:23:47 2020 +0100
jewel-layouts: make itemsVerticalAlign accept "itemCenter" (instead
itemCentered that is different to horizontal option and can be confusing)
---
.../Jewel/src/main/royale/org/apache/royale/jewel/Container.as | 5 +++--
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as | 5 +++--
.../royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as | 5 +++--
.../main/royale/org/apache/royale/jewel/beads/views/FormItemView.as | 4 ++--
.../main/royale/org/apache/royale/jewel/beads/views/WizardView.as | 4 ++--
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Container.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Container.as
index f3c771b..9a43555 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Container.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Container.as
@@ -123,7 +123,7 @@ package org.apache.royale.jewel
* Distribute all items vertically
* Possible values are:
* - itemsSameHeight
- * - itemsCentered
+ * - itemsCenter
* - itemsTop
* - itemsBottom
*
@@ -137,9 +137,10 @@ package org.apache.royale.jewel
return _layout.itemsVerticalAlign;
}
- [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCentered,itemsTop,itemsBottom")]
+ [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCenter,itemsTop,itemsBottom")]
public function set itemsVerticalAlign(value:String):void
{
+ if(value == "itemsCenter") value += "ed";
typeNames = StringUtil.removeWord(typeNames, " " +
_layout.itemsVerticalAlign);
_layout.itemsVerticalAlign = value;
typeNames += " " + _layout.itemsVerticalAlign;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
index 73e7f5f..2b85e46 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
@@ -186,7 +186,7 @@ package org.apache.royale.jewel
* Distribute all items vertically
* Possible values are:
* - itemsSameHeight
- * - itemsCentered
+ * - itemsCenter
* - itemsTop
* - itemsBottom
*
@@ -200,9 +200,10 @@ package org.apache.royale.jewel
return _layout.itemsVerticalAlign;
}
- [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCentered,itemsTop,itemsBottom")]
+ [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCenter,itemsTop,itemsBottom")]
public function set itemsVerticalAlign(value:String):void
{
+ if(value == "itemsCenter") value += "ed";
typeNames = StringUtil.removeWord(typeNames, " " +
_layout.itemsVerticalAlign);
_layout.itemsVerticalAlign = value;
typeNames += " " + _layout.itemsVerticalAlign;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
index 649f4d0..18809ca 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
@@ -188,7 +188,7 @@ package org.apache.royale.jewel.beads.layouts
* Distribute all items vertically
* Possible values are:
* - itemsSameHeight
- * - itemsCentered
+ * - itemsCenter
* - itemsTop
* - itemsBottom
*
@@ -202,9 +202,10 @@ package org.apache.royale.jewel.beads.layouts
return _itemsVerticalAlign;
}
- [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCentered,itemsTop,itemsBottom")]
+ [Inspectable(category="General",
enumeration="itemsSameHeight,itemsCenter,itemsTop,itemsBottom")]
public function set itemsVerticalAlign(value:String):void
{
+ if(value == "itemsCenter") value += "ed";
if (_itemsVerticalAlign != value)
{
COMPILE::JS
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
index d85ea6f..2ced36b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
@@ -172,7 +172,7 @@ package org.apache.royale.jewel.beads.views
if (labelGroup == null) {
labelGroup = new HGroup();
labelGroup.gap = 2;
- labelGroup.itemsHorizontalAlign =
"itemsCentered";
+ labelGroup.itemsVerticalAlign = "itemsCenter";
labelGroup.className = "labelGroup";
}
if (labelGroup != null && labelGroup.parent == null) {
@@ -253,7 +253,7 @@ package org.apache.royale.jewel.beads.views
// Now give the FormItem its own layout
//var layoutBead:IBeadLayout = new VerticalLayout();
- //layoutBead.itemsVerticalAlign = "itemsCentered";
+ //layoutBead.itemsVerticalAlign = "itemsCenter";
//_strand.addBead(layoutBead);
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/WizardView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/WizardView.as
index 6d6429d..90ae523 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/WizardView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/WizardView.as
@@ -219,7 +219,7 @@ package org.apache.royale.jewel.beads.views
var g:HGroup = new HGroup();
g.className = "precontent";
g.gap = 3;
- g.itemsHorizontalAlign = "itemsCentered";
+ g.itemsVerticalAlign = "itemsCenter";
// add the group that holds buttons and content
if (g.parent == null) {
vg.addElement(g);
@@ -356,7 +356,7 @@ package org.apache.royale.jewel.beads.views
// Now give the Wizard its own layout
// var layoutBead:WizardLayout = new WizardLayout();
- // layoutBead.itemsVerticalAlign = "itemsCentered";
+ // layoutBead.itemsVerticalAlign = "itemsCenter";
// _strand.addBead(layoutBead);
}
