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 2026/07/08 16:41:25 UTC
(royale-asjs) branch develop updated: Fixed binding
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 6cb50f0f5b Fixed binding
6cb50f0f5b is described below
commit 6cb50f0f5b3f5b52cb5195f4a1423a2d7a2abb63
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Jul 8 19:41:19 2026 +0300
Fixed binding
---
.../royale/style/stylebeads/BackgroundStyle.as | 56 +++---
.../royale/style/stylebeads/ContainerPosition.as | 42 +++--
.../royale/style/stylebeads/FlexContainerStyle.as | 22 +--
.../royale/style/stylebeads/FlexItemStyle.as | 28 +--
.../apache/royale/style/stylebeads/SelfPosition.as | 21 ++-
.../royale/style/stylebeads/border/Border.as | 200 +++++++++++----------
.../royale/style/stylebeads/border/BorderRadius.as | 57 +++---
.../royale/style/stylebeads/border/BorderWidth.as | 79 ++++----
.../royale/style/stylebeads/border/Outline.as | 26 ++-
.../royale/style/stylebeads/sizing/SizeStyle.as | 14 +-
.../royale/style/stylebeads/spacing/Margin.as | 75 ++++----
.../royale/style/stylebeads/spacing/Padding.as | 75 ++++----
12 files changed, 361 insertions(+), 334 deletions(-)
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/BackgroundStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/BackgroundStyle.as
index 0e19bee2af..034ff32447 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/BackgroundStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/BackgroundStyle.as
@@ -19,7 +19,6 @@
package org.apache.royale.style.stylebeads
{
- import org.apache.royale.debugging.assert;
import org.apache.royale.style.stylebeads.background.BackgroundAttachment;
import org.apache.royale.style.stylebeads.background.BackgroundColor;
import org.apache.royale.style.stylebeads.background.BackgroundClip;
@@ -69,12 +68,13 @@ package org.apache.royale.style.stylebeads
public function set attachment(value:String):void
{
+ _attachment = value;
if(!attachmentStyle)
{
- attachmentStyle = new BackgroundAttachment();
- addStyleBead(attachmentStyle);
+ attachmentStyle = new BackgroundAttachment(value);
+ return addStyleBead(attachmentStyle);
}
- attachmentStyle.value = _attachment = value;
+ attachmentStyle.value = value;
}
private var attachmentStyle:BackgroundAttachment;
private var _color:String;
@@ -92,12 +92,13 @@ package org.apache.royale.style.stylebeads
public function set color(value:String):void
{
+ _color = value;
if(!colorStyle)
{
- colorStyle = new BackgroundColor();
- addStyleBead(colorStyle);
+ colorStyle = new BackgroundColor(value);
+ return addStyleBead(colorStyle);
}
- colorStyle.value = _color = value;
+ colorStyle.value = value;
}
private var colorStyle:BackgroundColor;
private var _clip:String;
@@ -122,10 +123,10 @@ package org.apache.royale.style.stylebeads
_clip = value;
if(!clipStyle)
{
- clipStyle = new BackgroundClip();
- addStyleBead(clipStyle);
+ clipStyle = new BackgroundClip(value);
+ return addStyleBead(clipStyle);
}
- clipStyle.value = _clip;
+ clipStyle.value = value;
}
private var clipStyle:BackgroundClip;
//TODO gradient support
@@ -145,12 +146,13 @@ package org.apache.royale.style.stylebeads
public function set image(value:String):void
{
+ _image = value;
if(!imageStyle)
{
- imageStyle = new BackgroundImage();
- addStyleBead(imageStyle);
+ imageStyle = new BackgroundImage(value);
+ return addStyleBead(imageStyle);
}
- imageStyle.value = _image = value;
+ imageStyle.value = value;
}
private var imageStyle:BackgroundImage;
private var _origin:String;
@@ -166,12 +168,13 @@ package org.apache.royale.style.stylebeads
}
public function set origin(value:String):void
{
+ _origin = value;
if(!originStyle)
{
- originStyle = new BackgroundOrigin();
- addStyleBead(originStyle);
+ originStyle = new BackgroundOrigin(value);
+ return addStyleBead(originStyle);
}
- originStyle.value = _origin = value;
+ originStyle.value = value;
}
private var originStyle:BackgroundOrigin;
private var _position:String;
@@ -189,12 +192,13 @@ package org.apache.royale.style.stylebeads
public function set position(value:String):void
{
+ _position = value;
if(!positionStyle)
{
- positionStyle = new BackgroundPosition();
- addStyleBead(positionStyle);
+ positionStyle = new BackgroundPosition(value);
+ return addStyleBead(positionStyle);
}
- positionStyle.value = _position = value;
+ positionStyle.value = value;
}
private var positionStyle:BackgroundPosition;
private var _repeat:String;
@@ -217,12 +221,13 @@ package org.apache.royale.style.stylebeads
public function set repeat(value:String):void
{
+ _repeat = value;
if(!repeatStyle)
{
- repeatStyle = new BackgroundRepeat();
- addStyleBead(repeatStyle);
+ repeatStyle = new BackgroundRepeat(value);
+ return addStyleBead(repeatStyle);
}
- repeatStyle.value = _repeat = value;
+ repeatStyle.value = value;
}
private var repeatStyle:BackgroundRepeat;
private var _size:String;
@@ -248,12 +253,13 @@ package org.apache.royale.style.stylebeads
public function set size(value:String):void
{
+ _size = value;
if(!sizeStyle)
{
- sizeStyle = new BackgroundSize();
- addStyleBead(sizeStyle);
+ sizeStyle = new BackgroundSize(value);
+ return addStyleBead(sizeStyle);
}
- sizeStyle.value = _size = value;
+ sizeStyle.value = value;
}
private var sizeStyle:BackgroundSize;
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/ContainerPosition.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/ContainerPosition.as
index 0bc200accd..95e046c5a4 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/ContainerPosition.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/ContainerPosition.as
@@ -49,12 +49,13 @@ package org.apache.royale.style.stylebeads
}
public function set justifyContent(value:String):void
{
+ _justifyContent = value;
if(!justifyContentStyle)
{
- justifyContentStyle = new JustifyContent();
- addStyleBead(justifyContentStyle);
+ justifyContentStyle = new JustifyContent(value);
+ return addStyleBead(justifyContentStyle);
}
- justifyContentStyle.value = _justifyContent = value;
+ justifyContentStyle.value = value;
}
private var justifyContentStyle:JustifyContent;
@@ -75,12 +76,13 @@ package org.apache.royale.style.stylebeads
}
public function set alignItems(value:String):void
{
+ _alignItems = value;
if(!alignItemsStyle)
{
- alignItemsStyle = new AlignItems();
- addStyleBead(alignItemsStyle);
+ alignItemsStyle = new AlignItems(value);
+ return addStyleBead(alignItemsStyle);
}
- alignItemsStyle.value = _alignItems = value;
+ alignItemsStyle.value = value;
}
private var alignItemsStyle:AlignItems;
@@ -98,12 +100,13 @@ package org.apache.royale.style.stylebeads
}
public function set justifyItems(value:String):void
{
+ _justifyItems = value;
if(!justifyItemsStyle)
{
- justifyItemsStyle = new JustifyItems();
- addStyleBead(justifyItemsStyle);
+ justifyItemsStyle = new JustifyItems(value);
+ return addStyleBead(justifyItemsStyle);
}
- justifyItemsStyle.value = _justifyItems = value;
+ justifyItemsStyle.value = value;
}
private var justifyItemsStyle:JustifyItems;
@@ -124,12 +127,13 @@ package org.apache.royale.style.stylebeads
public function set alignContent(value:String):void
{
+ _alignContent = value;
if(!alignContentStyle)
{
- alignContentStyle = new AlignContent();
- addStyleBead(alignContentStyle);
+ alignContentStyle = new AlignContent(value);
+ return addStyleBead(alignContentStyle);
}
- alignContentStyle.value = _alignContent = value;
+ alignContentStyle.value = value;
}
private var alignContentStyle:AlignContent;
@@ -152,12 +156,13 @@ package org.apache.royale.style.stylebeads
public function set placeContent(value:String):void
{
+ _placeContent = value;
if(!placeContentStyle)
{
- placeContentStyle = new PlaceContent();
- addStyleBead(placeContentStyle);
+ placeContentStyle = new PlaceContent(value);
+ return addStyleBead(placeContentStyle);
}
- placeContentStyle.value = _placeContent = value;
+ placeContentStyle.value = value;
}
private var placeContentStyle:PlaceContent;
private var _placeItems:String;
@@ -179,12 +184,13 @@ package org.apache.royale.style.stylebeads
public function set placeItems(value:String):void
{
+ _placeItems = value;
if(!placeItemsStyle)
{
- placeItemsStyle = new PlaceItems();
- addStyleBead(placeItemsStyle);
+ placeItemsStyle = new PlaceItems(value);
+ return addStyleBead(placeItemsStyle);
}
- placeItemsStyle.value = _placeItems = value;
+ placeItemsStyle.value = value;
}
private var placeItemsStyle:PlaceItems;
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexContainerStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexContainerStyle.as
index 1735b322f1..267eedcc1a 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexContainerStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexContainerStyle.as
@@ -29,7 +29,7 @@ package org.apache.royale.style.stylebeads
public function FlexContainerStyle()
{
super();
- displayStyle = new Display();
+ displayStyle = new Display("flex");
addStyleBead(displayStyle);
}
@@ -64,14 +64,14 @@ package org.apache.royale.style.stylebeads
private var directionStyle:FlexDirection;
private function setDirection():void
{
- if(!directionStyle)
- {
- directionStyle = new FlexDirection();
- addStyleBead(directionStyle);
- }
var dir:String = _column ? "column" : "row";
if(reverse)
dir += "-reverse";
+ if(!directionStyle)
+ {
+ directionStyle = new FlexDirection(dir);
+ return addStyleBead(directionStyle);
+ }
directionStyle.value = dir;
}
private var _reverse:Boolean;
@@ -106,14 +106,14 @@ package org.apache.royale.style.stylebeads
}
private function setWrap():void
{
- if(!wrapStyle)
- {
- wrapStyle = new FlexWrap();
- addStyleBead(wrapStyle);
- }
var w:String = _wrap ? "wrap" : "nowrap";
if(_wrap && reverse)
w += "-reverse";
+ if(!wrapStyle)
+ {
+ wrapStyle = new FlexWrap(w);
+ return addStyleBead(wrapStyle);
+ }
wrapStyle.value = w;
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexItemStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexItemStyle.as
index 5cfb39acb1..ce011a03df 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexItemStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/FlexItemStyle.as
@@ -49,12 +49,13 @@ package org.apache.royale.style.stylebeads
}
public function set growFactor(value:Number):void
{
+ _growFactor = value;
if(!growStyle)
{
- growStyle = new FlexGrow();
- addStyleBead(growStyle);
+ growStyle = new FlexGrow(value);
+ return addStyleBead(growStyle);
}
- _growFactor = growStyle.value = value;
+ growStyle.value = value;
}
private var growStyle:FlexGrow;
@@ -80,12 +81,13 @@ package org.apache.royale.style.stylebeads
public function set shrinkFactor(value:Number):void
{
+ _shrinkFactor = value;
if(!shrinkStyle)
{
- shrinkStyle = new FlexShrink();
- addStyleBead(shrinkStyle);
+ shrinkStyle = new FlexShrink(value);
+ return addStyleBead(shrinkStyle);
}
- _shrinkFactor = shrinkStyle.value = value;
+ shrinkStyle.value = value;
}
private var shrinkStyle:FlexShrink;
private var _basis:String = "auto";
@@ -97,12 +99,13 @@ package org.apache.royale.style.stylebeads
public function set basis(value:String):void
{
+ _basis = value;
if(!basisStyle)
{
- basisStyle = new FlexBasis();
- addStyleBead(basisStyle);
+ basisStyle = new FlexBasis(value);
+ return addStyleBead(basisStyle);
}
- _basis = basisStyle.value = value;
+ basisStyle.value = value;
}
private var basisStyle:FlexBasis;
@@ -115,12 +118,13 @@ package org.apache.royale.style.stylebeads
public function set order(value:Number):void
{
+ _order = value;
if(!orderStyle)
{
- orderStyle = new Order();
- addStyleBead(orderStyle);
+ orderStyle = new Order(value);
+ return addStyleBead(orderStyle);
}
- _order = orderStyle.value = value;
+ orderStyle.value = value;
}
private var orderStyle:Order;
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/SelfPosition.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/SelfPosition.as
index b7fb741d64..d429a624f8 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/SelfPosition.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/SelfPosition.as
@@ -46,12 +46,13 @@ package org.apache.royale.style.stylebeads
}
public function set justifySelf(value:String):void
{
+ _justifySelf = value;
if(!jutifySelfStyle)
{
- jutifySelfStyle = new JustifySelf();
- addStyleBead(jutifySelfStyle);
+ jutifySelfStyle = new JustifySelf(value);
+ return addStyleBead(jutifySelfStyle);
}
- _justifySelf = jutifySelfStyle.value = value;
+ jutifySelfStyle.value = value;
}
private var jutifySelfStyle:JustifySelf;
@@ -72,12 +73,13 @@ package org.apache.royale.style.stylebeads
}
public function set alignSelf(value:String):void
{
+ _alignSelf = value;
if(!alignSelfStyle)
{
- alignSelfStyle = new AlignSelf();
- addStyleBead(alignSelfStyle);
+ alignSelfStyle = new AlignSelf(value);
+ return addStyleBead(alignSelfStyle);
}
- _alignSelf = alignSelfStyle.value = value;
+ alignSelfStyle.value = value;
}
private var alignSelfStyle:AlignSelf;
@@ -100,12 +102,13 @@ package org.apache.royale.style.stylebeads
public function set placeSelf(value:String):void
{
+ _placeSelf = value;
if(!placeSelfStyle)
{
- placeSelfStyle = new PlaceSelf();
- addStyleBead(placeSelfStyle);
+ placeSelfStyle = new PlaceSelf(value);
+ return addStyleBead(placeSelfStyle);
}
- _placeSelf = placeSelfStyle.value = value;
+ placeSelfStyle.value = value;
}
private var placeSelfStyle:PlaceSelf;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Border.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Border.as
index 54e6f8e321..fd4dc8d8cb 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Border.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Border.as
@@ -19,8 +19,6 @@
package org.apache.royale.style.stylebeads.border
{
import org.apache.royale.style.stylebeads.LeafStyleBase;
- import org.apache.royale.debugging.assert;
- import org.apache.royale.style.util.StyleData;
import org.apache.royale.style.stylebeads.CompositeStyle;
/**
* Has color, style, width, and radius style for simple application of those properties.
@@ -54,13 +52,13 @@ package org.apache.royale.style.stylebeads.border
private var colorStyle:BorderColor;
public function set color(value:String):void
{
+ _color = value;
if(!colorStyle)
{
- colorStyle = new BorderColor();
- addStyleBead(colorStyle);
+ colorStyle = new BorderColor("border", "border-color", value);
+ return addStyleBead(colorStyle);
}
colorStyle.value = value;
- _color = value;
}
private var _topColor:String;
public function get topColor():String
@@ -70,13 +68,13 @@ package org.apache.royale.style.stylebeads.border
private var topColorStyle:BorderColor;
public function set topColor(value:String):void
{
+ _topColor = value;
if(!topColorStyle)
{
- topColorStyle = new BorderColor("border-t", "border-top-color");
- addStyleBead(topColorStyle);
+ topColorStyle = new BorderColor("border-t", "border-top-color", value);
+ return addStyleBead(topColorStyle);
}
topColorStyle.value = value;
- _topColor = value;
}
private var _bottomColor:String;
public function get bottomColor():String
@@ -86,13 +84,13 @@ package org.apache.royale.style.stylebeads.border
private var bottomColorStyle:BorderColor;
public function set bottomColor(value:String):void
{
+ _bottomColor = value;
if(!bottomColorStyle)
{
- bottomColorStyle = new BorderColor("border-b", "border-bottom-color");
- addStyleBead(bottomColorStyle);
+ bottomColorStyle = new BorderColor("border-b", "border-bottom-color", value);
+ return addStyleBead(bottomColorStyle);
}
bottomColorStyle.value = value;
- _bottomColor = value;
}
private var _leftColor:String;
public function get leftColor():String
@@ -102,13 +100,13 @@ package org.apache.royale.style.stylebeads.border
private var leftColorStyle:BorderColor;
public function set leftColor(value:String):void
{
+ _leftColor = value;
if(!leftColorStyle)
{
- leftColorStyle = new BorderColor("border-l", "border-left-color");
- addStyleBead(leftColorStyle);
+ leftColorStyle = new BorderColor("border-l", "border-left-color", value);
+ return addStyleBead(leftColorStyle);
}
leftColorStyle.value = value;
- _leftColor = value;
}
private var _rightColor:String;
public function get rightColor():String
@@ -118,13 +116,13 @@ package org.apache.royale.style.stylebeads.border
private var rightColorStyle:BorderColor;
public function set rightColor(value:String):void
{
+ _rightColor = value;
if(!rightColorStyle)
{
- rightColorStyle = new BorderColor("border-r", "border-right-color");
- addStyleBead(rightColorStyle);
+ rightColorStyle = new BorderColor("border-r", "border-right-color", value);
+ return addStyleBead(rightColorStyle);
}
rightColorStyle.value = value;
- _rightColor = value;
}
private var _blockColor:String;
public function get blockColor():String
@@ -134,13 +132,13 @@ package org.apache.royale.style.stylebeads.border
private var blockColorStyle:BorderColor;
public function set blockColor(value:String):void
{
+ _blockColor = value;
if(!blockColorStyle)
{
- blockColorStyle = new BorderColor("border-y", "border-block-color");
- addStyleBead(blockColorStyle);
+ blockColorStyle = new BorderColor("border-y", "border-block-color", value);
+ return addStyleBead(blockColorStyle);
}
blockColorStyle.value = value;
- _blockColor = value;
}
private var _blockStartColor:String;
public function get blockStartColor():String
@@ -150,13 +148,13 @@ package org.apache.royale.style.stylebeads.border
private var blockStartColorStyle:BorderColor;
public function set blockStartColor(value:String):void
{
+ _blockStartColor = value;
if(!blockStartColorStyle)
{
- blockStartColorStyle = new BorderColor("border-bs", "border-block-start-color");
- addStyleBead(blockStartColorStyle);
+ blockStartColorStyle = new BorderColor("border-bs", "border-block-start-color", value);
+ return addStyleBead(blockStartColorStyle);
}
blockStartColorStyle.value = value;
- _blockStartColor = value;
}
private var _blockEndColor:String;
public function get blockEndColor():String
@@ -166,13 +164,13 @@ package org.apache.royale.style.stylebeads.border
private var blockEndColorStyle:BorderColor;
public function set blockEndColor(value:String):void
{
+ _blockEndColor = value;
if(!blockEndColorStyle)
{
- blockEndColorStyle = new BorderColor("border-be", "border-block-end-color");
- addStyleBead(blockEndColorStyle);
+ blockEndColorStyle = new BorderColor("border-be", "border-block-end-color", value);
+ return addStyleBead(blockEndColorStyle);
}
blockEndColorStyle.value = value;
- _blockEndColor = value;
}
private var _inlineColor:String;
public function get inlineColor():String
@@ -182,13 +180,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineColorStyle:BorderColor;
public function set inlineColor(value:String):void
{
+ _inlineColor = value;
if(!inlineColorStyle)
{
- inlineColorStyle = new BorderColor("border-x", "border-inline-color");
- addStyleBead(inlineColorStyle);
+ inlineColorStyle = new BorderColor("border-x", "border-inline-color", value);
+ return addStyleBead(inlineColorStyle);
}
inlineColorStyle.value = value;
- _inlineColor = value;
}
private var _inlineStartColor:String;
public function get inlineStartColor():String
@@ -198,13 +196,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineStartColorStyle:BorderColor;
public function set inlineStartColor(value:String):void
{
+ _inlineStartColor = value;
if(!inlineStartColorStyle)
{
- inlineStartColorStyle = new BorderColor("border-s", "border-inline-start-color");
- addStyleBead(inlineStartColorStyle);
+ inlineStartColorStyle = new BorderColor("border-s", "border-inline-start-color", value);
+ return addStyleBead(inlineStartColorStyle);
}
inlineStartColorStyle.value = value;
- _inlineStartColor = value;
}
private var _inlineEndColor:String;
public function get inlineEndColor():String
@@ -214,13 +212,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineEndColorStyle:BorderColor;
public function set inlineEndColor(value:String):void
{
+ _inlineEndColor = value;
if(!inlineEndColorStyle)
{
- inlineEndColorStyle = new BorderColor("border-e", "border-inline-end-color");
- addStyleBead(inlineEndColorStyle);
+ inlineEndColorStyle = new BorderColor("border-e", "border-inline-end-color", value);
+ return addStyleBead(inlineEndColorStyle);
}
inlineEndColorStyle.value = value;
- _inlineEndColor = value;
}
private var _style:String;
@@ -231,13 +229,13 @@ package org.apache.royale.style.stylebeads.border
private var styleStyle:BorderStyle;
public function set style(value:String):void
{
+ _style = value;
if(!styleStyle)
{
- styleStyle = new BorderStyle();
- addStyleBead(styleStyle);
+ styleStyle = new BorderStyle("border", "border-style", value);
+ return addStyleBead(styleStyle);
}
styleStyle.value = value;
- _style = value;
}
private var _topStyle:String;
public function get topStyle():String
@@ -247,13 +245,13 @@ package org.apache.royale.style.stylebeads.border
private var tStyle:BorderStyle;
public function set topStyle(value:String):void
{
+ _topStyle = value;
if(!tStyle)
{
- tStyle = new BorderStyle("border-t", "border-top-style");
- addStyleBead(tStyle);
+ tStyle = new BorderStyle("border-t", "border-top-style", value);
+ return addStyleBead(tStyle);
}
tStyle.value = value;
- _topStyle = value;
}
private var _bottomStyle:String;
public function get bottomStyle():String
@@ -263,13 +261,13 @@ package org.apache.royale.style.stylebeads.border
private var bStyle:BorderStyle;
public function set bottomStyle(value:String):void
{
+ _bottomStyle = value;
if(!bStyle)
{
- bStyle = new BorderStyle("border-b", "border-bottom-style");
- addStyleBead(bStyle);
+ bStyle = new BorderStyle("border-b", "border-bottom-style", value);
+ return addStyleBead(bStyle);
}
bStyle.value = value;
- _bottomStyle = value;
}
private var _leftStyle:String;
public function get leftStyle():String
@@ -279,13 +277,13 @@ package org.apache.royale.style.stylebeads.border
private var lStyle:BorderStyle;
public function set leftStyle(value:String):void
{
+ _leftStyle = value;
if(!lStyle)
{
- lStyle = new BorderStyle("border-l", "border-left-style");
- addStyleBead(lStyle);
+ lStyle = new BorderStyle("border-l", "border-left-style", value);
+ return addStyleBead(lStyle);
}
lStyle.value = value;
- _leftStyle = value;
}
private var _rightStyle:String;
public function get rightStyle():String
@@ -295,13 +293,13 @@ package org.apache.royale.style.stylebeads.border
private var rStyle:BorderStyle;
public function set rightStyle(value:String):void
{
+ _rightStyle = value;
if(!rStyle)
{
- rStyle = new BorderStyle("border-r", "border-right-style");
- addStyleBead(rStyle);
+ rStyle = new BorderStyle("border-r", "border-right-style", value);
+ return addStyleBead(rStyle);
}
rStyle.value = value;
- _rightStyle = value;
}
private var _blockStyle:String;
public function get blockStyle():String
@@ -311,13 +309,13 @@ package org.apache.royale.style.stylebeads.border
private var blkStyle:BorderStyle;
public function set blockStyle(value:String):void
{
+ _blockStyle = value;
if(!blkStyle)
{
- blkStyle = new BorderStyle("border-y", "border-block-style");
- addStyleBead(blkStyle);
+ blkStyle = new BorderStyle("border-y", "border-block-style", value);
+ return addStyleBead(blkStyle);
}
blkStyle.value = value;
- _blockStyle = value;
}
private var _blockStartStyle:String;
public function get blockStartStyle():String
@@ -327,13 +325,13 @@ package org.apache.royale.style.stylebeads.border
private var blkStartStyle:BorderStyle;
public function set blockStartStyle(value:String):void
{
+ _blockStartStyle = value;
if(!blkStartStyle)
{
- blkStartStyle = new BorderStyle("border-bs", "border-block-start-style");
- addStyleBead(blkStartStyle);
+ blkStartStyle = new BorderStyle("border-bs", "border-block-start-style", value);
+ return addStyleBead(blkStartStyle);
}
blkStartStyle.value = value;
- _blockStartStyle = value;
}
private var _blockEndStyle:String;
public function get blockEndStyle():String
@@ -343,13 +341,13 @@ package org.apache.royale.style.stylebeads.border
private var blkEndStyle:BorderStyle;
public function set blockEndStyle(value:String):void
{
+ _blockEndStyle = value;
if(!blkEndStyle)
{
- blkEndStyle = new BorderStyle("border-be", "border-block-end-style");
- addStyleBead(blkEndStyle);
+ blkEndStyle = new BorderStyle("border-be", "border-block-end-style", value);
+ return addStyleBead(blkEndStyle);
}
blkEndStyle.value = value;
- _blockEndStyle = value;
}
private var _inlineStyle:String;
public function get inlineStyle():String
@@ -359,13 +357,13 @@ package org.apache.royale.style.stylebeads.border
private var inlStyle:BorderStyle;
public function set inlineStyle(value:String):void
{
+ _inlineStyle = value;
if(!inlStyle)
{
- inlStyle = new BorderStyle("border-x", "border-inline-style");
- addStyleBead(inlStyle);
+ inlStyle = new BorderStyle("border-x", "border-inline-style", value);
+ return addStyleBead(inlStyle);
}
inlStyle.value = value;
- _inlineStyle = value;
}
private var _inlineStartStyle:String;
public function get inlineStartStyle():String
@@ -375,13 +373,13 @@ package org.apache.royale.style.stylebeads.border
private var inlStartStyle:BorderStyle;
public function set inlineStartStyle(value:String):void
{
+ _inlineStartStyle = value;
if(!inlStartStyle)
{
- inlStartStyle = new BorderStyle("border-s", "border-inline-start-style");
- addStyleBead(inlStartStyle);
+ inlStartStyle = new BorderStyle("border-s", "border-inline-start-style", value);
+ return addStyleBead(inlStartStyle);
}
inlStartStyle.value = value;
- _inlineStartStyle = value;
}
private var _inlineEndStyle:String;
public function get inlineEndStyle():String
@@ -391,13 +389,13 @@ package org.apache.royale.style.stylebeads.border
private var inlEndStyle:BorderStyle;
public function set inlineEndStyle(value:String):void
{
+ _inlineEndStyle = value;
if(!inlEndStyle)
{
- inlEndStyle = new BorderStyle("border-e", "border-inline-end-style");
- addStyleBead(inlEndStyle);
+ inlEndStyle = new BorderStyle("border-e", "border-inline-end-style", value);
+ return addStyleBead(inlEndStyle);
}
inlEndStyle.value = value;
- _inlineEndStyle = value;
}
private var _width:*;
@@ -408,14 +406,14 @@ package org.apache.royale.style.stylebeads.border
private var widthStyle:BorderWidth;
public function set width(value:*):void
{
+ _width = value;
if(!widthStyle)
{
- widthStyle = new BorderWidth();
+ widthStyle = new BorderWidth(value);
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ return addStyleBead(widthStyle);
}
widthStyle.width = value;
- _width = value;
}
public function get topWidth():*
{
@@ -427,7 +425,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.top = value;
+ return addStyleBead(widthStyle);
}
widthStyle.top = value;
}
@@ -441,7 +440,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.bottom = value;
+ return addStyleBead(widthStyle);
}
widthStyle.bottom = value;
}
@@ -455,7 +455,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.left = value;
+ return addStyleBead(widthStyle);
}
widthStyle.left = value;
}
@@ -469,7 +470,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.right = value;
+ return addStyleBead(widthStyle);
}
widthStyle.right = value;
}
@@ -483,7 +485,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.block = value;
+ return addStyleBead(widthStyle);
}
widthStyle.block = value;
}
@@ -497,7 +500,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.blockStart = value;
+ return addStyleBead(widthStyle);
}
widthStyle.blockStart = value;
}
@@ -511,7 +515,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.blockEnd = value;
+ return addStyleBead(widthStyle);
}
widthStyle.blockEnd = value;
}
@@ -525,7 +530,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.inline = value;
+ return addStyleBead(widthStyle);
}
widthStyle.inline = value;
}
@@ -539,7 +545,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.inlineStart = value;
+ return addStyleBead(widthStyle);
}
widthStyle.inlineStart = value;
}
@@ -553,7 +560,8 @@ package org.apache.royale.style.stylebeads.border
{
widthStyle = new BorderWidth();
widthStyle.unit = unit;
- addStyleBead(widthStyle);
+ widthStyle.inlineEnd = value;
+ return addStyleBead(widthStyle);
}
widthStyle.inlineEnd = value;
}
@@ -566,14 +574,14 @@ package org.apache.royale.style.stylebeads.border
private var radiusStyle:BorderRadius;
public function set radius(value:*):void
{
+ _radius = value;
if(!radiusStyle)
{
- radiusStyle = new BorderRadius();
+ radiusStyle = new BorderRadius(value);
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ return addStyleBead(radiusStyle);
}
radiusStyle.radius = value;
- _radius = value;
}
public function get topLeftRadius():*
{
@@ -585,7 +593,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.topLeft = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.topLeft = value;
}
@@ -599,7 +608,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.topRight = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.topRight = value;
}
@@ -613,7 +623,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.bottomLeft = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.bottomLeft = value;
}
@@ -627,7 +638,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.bottomRight = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.bottomRight = value;
}
@@ -641,7 +653,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.startStart = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.startStart = value;
}
@@ -655,7 +668,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.startEnd = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.startEnd = value;
}
@@ -669,7 +683,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.endStart = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.endStart = value;
}
@@ -683,7 +698,8 @@ package org.apache.royale.style.stylebeads.border
{
radiusStyle = new BorderRadius();
radiusStyle.unit = unit;
- addStyleBead(radiusStyle);
+ radiusStyle.endEnd = value;
+ return addStyleBead(radiusStyle);
}
radiusStyle.endEnd = value;
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
index 085ec0efa5..b4d8d66c48 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
@@ -19,9 +19,6 @@
package org.apache.royale.style.stylebeads.border
{
import org.apache.royale.style.stylebeads.LeafStyleBase;
- import org.apache.royale.debugging.assert;
- import org.apache.royale.style.util.ThemeManager;
- import org.apache.royale.style.util.StyleTheme;
import org.apache.royale.style.stylebeads.CompositeStyle;
public class BorderRadius extends CompositeStyle
@@ -45,12 +42,12 @@ package org.apache.royale.style.stylebeads.border
private var rStyle:Radius;
public function set radius(value:*):void
{
+ _radius = value;
if(!rStyle)
{
- rStyle = new Radius();
- addStyleBead(rStyle);
+ rStyle = new Radius("rounded", "border-radius", value);
+ return addStyleBead(rStyle);
}
- _radius = value;
rStyle.value = value;
}
private var _topLeft:*;
@@ -62,12 +59,12 @@ package org.apache.royale.style.stylebeads.border
private var tlStyle:TopLeft;
public function set topLeft(value:*):void
{
+ _topLeft = value;
if(!tlStyle)
{
- tlStyle = new TopLeft();
- addStyleBead(tlStyle);
+ tlStyle = new TopLeft(value);
+ return addStyleBead(tlStyle);
}
- _topLeft = value;
tlStyle.value = value;
}
private var _topRight:*;
@@ -78,12 +75,12 @@ package org.apache.royale.style.stylebeads.border
private var trStyle:TopRight;
public function set topRight(value:*):void
{
+ _topRight = value;
if(!trStyle)
{
- trStyle = new TopRight();
- addStyleBead(trStyle);
+ trStyle = new TopRight(value);
+ return addStyleBead(trStyle);
}
- _topRight = value;
trStyle.value = value;
}
private var _bottomLeft:*;
@@ -94,12 +91,12 @@ package org.apache.royale.style.stylebeads.border
private var blStyle:BottomLeft;
public function set bottomLeft(value:*):void
{
+ _bottomLeft = value;
if(!blStyle)
{
- blStyle = new BottomLeft();
- addStyleBead(blStyle);
+ blStyle = new BottomLeft(value);
+ return addStyleBead(blStyle);
}
- _bottomLeft = value;
blStyle.value = value;
}
private var _bottomRight:*;
@@ -110,12 +107,12 @@ package org.apache.royale.style.stylebeads.border
private var brStyle:BottomRight;
public function set bottomRight(value:*):void
{
+ _bottomRight = value;
if(!brStyle)
{
- brStyle = new BottomRight();
- addStyleBead(brStyle);
+ brStyle = new BottomRight(value);
+ return addStyleBead(brStyle);
}
- _bottomRight = value;
brStyle.value = value;
}
private var _startStart:*;
@@ -126,12 +123,12 @@ package org.apache.royale.style.stylebeads.border
private var ssStyle:StartStart;
public function set startStart(value:*):void
{
+ _startStart = value;
if(!ssStyle)
{
- ssStyle = new StartStart();
- addStyleBead(ssStyle);
+ ssStyle = new StartStart(value);
+ return addStyleBead(ssStyle);
}
- _startStart = value;
ssStyle.value = value;
}
private var _startEnd:*;
@@ -142,12 +139,12 @@ package org.apache.royale.style.stylebeads.border
private var seStyle:StartEnd;
public function set startEnd(value:*):void
{
+ _startEnd = value;
if(!seStyle)
{
- seStyle = new StartEnd();
- addStyleBead(seStyle);
+ seStyle = new StartEnd(value);
+ return addStyleBead(seStyle);
}
- _startEnd = value;
seStyle.value = value;
}
private var _endStart:*;
@@ -158,12 +155,12 @@ package org.apache.royale.style.stylebeads.border
private var esStyle:EndStart;
public function set endStart(value:*):void
{
+ _endStart = value;
if(!esStyle)
{
- esStyle = new EndStart();
- addStyleBead(esStyle);
+ esStyle = new EndStart(value);
+ return addStyleBead(esStyle);
}
- _endStart = value;
esStyle.value = value;
}
private var _endEnd:*;
@@ -174,12 +171,12 @@ package org.apache.royale.style.stylebeads.border
private var eeStyle:EndEnd;
public function set endEnd(value:*):void
{
+ _endEnd = value;
if(!eeStyle)
{
- eeStyle = new EndEnd();
- addStyleBead(eeStyle);
+ eeStyle = new EndEnd(value);
+ return addStyleBead(eeStyle);
}
- _endEnd = value;
eeStyle.value = value;
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
index a2754cd4db..545b923c65 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
@@ -19,9 +19,6 @@
package org.apache.royale.style.stylebeads.border
{
import org.apache.royale.style.stylebeads.LeafStyleBase;
- import org.apache.royale.debugging.assert;
- import org.apache.royale.style.util.ThemeManager;
- import org.apache.royale.style.util.StyleTheme;
import org.apache.royale.style.stylebeads.CompositeStyle;
public class BorderWidth extends CompositeStyle
@@ -30,8 +27,8 @@ package org.apache.royale.style.stylebeads.border
{
super();
this.unit = unit;
- if(value)
- this.width = value;
+ if(value != width)
+ width = value;
}
private var _width:*;
@@ -42,13 +39,13 @@ package org.apache.royale.style.stylebeads.border
private var widthStyle:Width;
public function set width(value:*):void
{
- if(!widthStyle)
+ _width = value;
+ if(!widthStyle)
{
- widthStyle = new Width();
- addStyleBead(widthStyle);
+ widthStyle = new Width("border", "border-width", value);
+ return addStyleBead(widthStyle);
}
widthStyle.value = value;
- _width = value;
}
private var _top:*;
@@ -59,13 +56,13 @@ package org.apache.royale.style.stylebeads.border
private var topStyle:Top;
public function set top(value:*):void
{
- if(!topStyle)
+ _top = value;
+ if(!topStyle)
{
- topStyle = new Top();
- addStyleBead(topStyle);
+ topStyle = new Top(value);
+ return addStyleBead(topStyle);
}
topStyle.value = value;
- _top = value;
}
private var _left:*;
@@ -76,13 +73,13 @@ package org.apache.royale.style.stylebeads.border
private var leftStyle:Left;
public function set left(value:*):void
{
- if(!leftStyle)
+ _left = value;
+ if(!leftStyle)
{
- leftStyle = new Left();
- addStyleBead(leftStyle);
+ leftStyle = new Left(value);
+ return addStyleBead(leftStyle);
}
leftStyle.value = value;
- _left = value;
}
private var _right:*;
@@ -93,13 +90,13 @@ package org.apache.royale.style.stylebeads.border
private var rightStyle:Right;
public function set right(value:*):void
{
+ _right = value;
if(!rightStyle)
{
- rightStyle = new Right();
- addStyleBead(rightStyle);
+ rightStyle = new Right(value);
+ return addStyleBead(rightStyle);
}
rightStyle.value = value;
- _right = value;
}
private var _bottom:*;
@@ -110,13 +107,13 @@ package org.apache.royale.style.stylebeads.border
private var bottomStyle:Bottom;
public function set bottom(value:*):void
{
+ _bottom = value;
if(!bottomStyle)
{
- bottomStyle = new Bottom();
- addStyleBead(bottomStyle);
+ bottomStyle = new Bottom(value);
+ return addStyleBead(bottomStyle);
}
bottomStyle.value = value;
- _bottom = value;
}
private var _block:*;
@@ -127,13 +124,13 @@ package org.apache.royale.style.stylebeads.border
private var blockStyle:Block;
public function set block(value:*):void
{
+ _block = value;
if(!blockStyle)
{
- blockStyle = new Block();
- addStyleBead(blockStyle);
+ blockStyle = new Block(value);
+ return addStyleBead(blockStyle);
}
blockStyle.value = value;
- _block = value;
}
private var _blockEnd:*;
@@ -144,13 +141,13 @@ package org.apache.royale.style.stylebeads.border
private var blockEndStyle:BlockEnd;
public function set blockEnd(value:*):void
{
+ _blockEnd = value;
if(!blockEndStyle)
{
- blockEndStyle = new BlockEnd();
- addStyleBead(blockEndStyle);
+ blockEndStyle = new BlockEnd(value);
+ return addStyleBead(blockEndStyle);
}
blockEndStyle.value = value;
- _blockEnd = value;
}
private var _blockStart:*;
@@ -161,13 +158,13 @@ package org.apache.royale.style.stylebeads.border
private var blockStartStyle:BlockStart;
public function set blockStart(value:*):void
{
+ _blockStart = value;
if(!blockStartStyle)
{
- blockStartStyle = new BlockStart();
- addStyleBead(blockStartStyle);
+ blockStartStyle = new BlockStart(value);
+ return addStyleBead(blockStartStyle);
}
blockStartStyle.value = value;
- _blockStart = value;
}
private var _inline:*;
@@ -178,13 +175,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineStyle:Inline;
public function set inline(value:*):void
{
+ _inline = value;
if(!inlineStyle)
{
- inlineStyle = new Inline();
- addStyleBead(inlineStyle);
+ inlineStyle = new Inline(value);
+ return addStyleBead(inlineStyle);
}
inlineStyle.value = value;
- _inline = value;
}
private var _inlineEnd:*;
@@ -195,13 +192,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineEndStyle:InlineEnd;
public function set inlineEnd(value:*):void
{
+ _inlineEnd = value;
if(!inlineEndStyle)
{
- inlineEndStyle = new InlineEnd();
- addStyleBead(inlineEndStyle);
+ inlineEndStyle = new InlineEnd(value);
+ return addStyleBead(inlineEndStyle);
}
inlineEndStyle.value = value;
- _inlineEnd = value;
}
private var _inlineStart:*;
@@ -212,13 +209,13 @@ package org.apache.royale.style.stylebeads.border
private var inlineStartStyle:InlineStart;
public function set inlineStart(value:*):void
{
+ _inlineStart = value;
if(!inlineStartStyle)
{
- inlineStartStyle = new InlineStart();
- addStyleBead(inlineStartStyle);
+ inlineStartStyle = new InlineStart(value);
+ return addStyleBead(inlineStartStyle);
}
inlineStartStyle.value = value;
- _inlineStart = value;
}
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Outline.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Outline.as
index b2e22da49d..d18f6e562c 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Outline.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/Outline.as
@@ -19,8 +19,6 @@
package org.apache.royale.style.stylebeads.border
{
import org.apache.royale.style.stylebeads.LeafStyleBase;
- import org.apache.royale.debugging.assert;
- import org.apache.royale.style.util.StyleData;
import org.apache.royale.style.stylebeads.CompositeStyle;
public class Outline extends CompositeStyle
@@ -46,13 +44,13 @@ package org.apache.royale.style.stylebeads.border
private var colorStyle:BorderColor;
public function set color(value:String):void
{
+ _color = value;
if(!colorStyle)
{
- colorStyle = new BorderColor("outline", "outline-color");
- addStyleBead(colorStyle);
+ colorStyle = new BorderColor("outline", "outline-color", value);
+ return addStyleBead(colorStyle);
}
colorStyle.value = value;
- _color = value;
}
private var _offset:*;
public function get offset():*
@@ -62,13 +60,13 @@ package org.apache.royale.style.stylebeads.border
private var offsetStyle:Offset;
public function set offset(value:*):void
{
+ _offset = value;
if(!offsetStyle)
{
- offsetStyle = new Offset();
- addStyleBead(offsetStyle);
+ offsetStyle = new Offset(value);
+ return addStyleBead(offsetStyle);
}
offsetStyle.value = value;
- _offset = value;
}
private var _style:String;
public function get style():String
@@ -78,13 +76,13 @@ package org.apache.royale.style.stylebeads.border
private var styleStyle:BorderStyle;
public function set style(value:String):void
{
+ _style = value;
if(!styleStyle)
{
- styleStyle = new Style();
- addStyleBead(styleStyle);
+ styleStyle = new Style(value);
+ return addStyleBead(styleStyle);
}
styleStyle.value = value;
- _style = value;
}
private var _width:*;
public function get width():*
@@ -94,13 +92,13 @@ package org.apache.royale.style.stylebeads.border
private var widthStyle:Width;
public function set width(value:*):void
{
+ _width = value;
if(!widthStyle)
{
- widthStyle = new Width();
- addStyleBead(widthStyle);
+ widthStyle = new Width(value);
+ return addStyleBead(widthStyle);
}
widthStyle.value = value;
- _width = value;
}
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/sizing/SizeStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/sizing/SizeStyle.as
index 6ea491a171..a9c8f98511 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/sizing/SizeStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/sizing/SizeStyle.as
@@ -36,12 +36,13 @@ package org.apache.royale.style.stylebeads.sizing
public function set width(value:*):void
{
+ _width = value;
if(!widthStyle)
{
- widthStyle = new WidthStyle();
- addStyleBead(widthStyle);
+ widthStyle = new WidthStyle(value);
+ return addStyleBead(widthStyle);
}
- _width = widthStyle.value = value;
+ widthStyle.value = value;
}
private var heightStyle:HeightStyle;
private var _height:*;
@@ -53,12 +54,13 @@ package org.apache.royale.style.stylebeads.sizing
public function set height(value:*):void
{
+ _height = value;
if(!heightStyle)
{
- heightStyle = new HeightStyle();
- addStyleBead(heightStyle);
+ heightStyle = new HeightStyle(value);
+ return addStyleBead(heightStyle);
}
- _height = heightStyle.value = value;
+ heightStyle.value = value;
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
index c7945587bd..2faf8e3660 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
@@ -52,24 +52,23 @@ package org.apache.royale.style.stylebeads.spacing
public function set margin(value:*):void
{
resetMarginStyles();
+ _margin = value;
var shorthand:Array = parseShorthandCSS(value);
if(shorthand)
{
applyShorthand(shorthand);
- _margin = value;
return;
}
- if(!marginStyle)
- {
- marginStyle = new Marg();
- addStyleBead(marginStyle);
- }
- marginStyle.value = value;
_top = value;
_right = value;
_bottom = value;
_left = value;
- _margin = value;
+ if(!marginStyle)
+ {
+ marginStyle = new Marg("m", "margin", value);
+ return addStyleBead(marginStyle);
+ }
+ marginStyle.value = value;
}
private function resetMarginStyles():void
@@ -126,13 +125,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set top(value:*):void
{
+ _top = value;
if(!topStyle)
{
- topStyle = new MarginTop();
- addStyleBead(topStyle);
+ topStyle = new MarginTop(value);
+ return addStyleBead(topStyle);
}
topStyle.value = value;
- _top = value;
}
private var _right:*;
@@ -143,13 +142,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set right(value:*):void
{
+ _right = value;
if(!rightStyle)
{
- rightStyle = new MarginRight();
- addStyleBead(rightStyle);
+ rightStyle = new MarginRight(value);
+ return addStyleBead(rightStyle);
}
rightStyle.value = value;
- _right = value;
}
private var _bottom:*;
@@ -160,13 +159,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set bottom(value:*):void
{
+ _bottom = value;
if(!bottomStyle)
{
- bottomStyle = new MarginBottom();
- addStyleBead(bottomStyle);
+ bottomStyle = new MarginBottom(value);
+ return addStyleBead(bottomStyle);
}
bottomStyle.value = value;
- _bottom = value;
}
private var _left:*;
@@ -177,13 +176,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set left(value:*):void
{
+ _left = value;
if(!leftStyle)
{
- leftStyle = new MarginLeft();
- addStyleBead(leftStyle);
+ leftStyle = new MarginLeft(value);
+ return addStyleBead(leftStyle);
}
leftStyle.value = value;
- _left = value;
}
private var _block:*;
@@ -194,13 +193,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set block(value:*):void
{
+ _block = value;
if(!blockStyle)
{
- blockStyle = new MarginBlock();
- addStyleBead(blockStyle);
+ blockStyle = new MarginBlock(value);
+ return addStyleBead(blockStyle);
}
blockStyle.value = value;
- _block = value;
}
private var _blockStart:*;
@@ -211,13 +210,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set blockStart(value:*):void
{
+ _blockStart = value;
if(!blockStartStyle)
{
- blockStartStyle = new MarginBlockStart();
- addStyleBead(blockStartStyle);
+ blockStartStyle = new MarginBlockStart(value);
+ return addStyleBead(blockStartStyle);
}
blockStartStyle.value = value;
- _blockStart = value;
}
private var _blockEnd:*;
@@ -228,13 +227,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set blockEnd(value:*):void
{
+ _blockEnd = value;
if(!blockEndStyle)
{
- blockEndStyle = new MarginBlockEnd();
- addStyleBead(blockEndStyle);
+ blockEndStyle = new MarginBlockEnd(value);
+ return addStyleBead(blockEndStyle);
}
blockEndStyle.value = value;
- _blockEnd = value;
}
private var _inline:*;
@@ -245,13 +244,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inline(value:*):void
{
+ _inline = value;
if(!inlineStyle)
{
- inlineStyle = new MarginInline();
- addStyleBead(inlineStyle);
+ inlineStyle = new MarginInline(value);
+ return addStyleBead(inlineStyle);
}
inlineStyle.value = value;
- _inline = value;
}
private var _inlineStart:*;
@@ -262,13 +261,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inlineStart(value:*):void
{
+ _inlineStart = value;
if(!inlineStartStyle)
{
- inlineStartStyle = new MarginInlineStart();
- addStyleBead(inlineStartStyle);
+ inlineStartStyle = new MarginInlineStart(value);
+ return addStyleBead(inlineStartStyle);
}
inlineStartStyle.value = value;
- _inlineStart = value;
}
private var _inlineEnd:*;
@@ -279,13 +278,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inlineEnd(value:*):void
{
+ _inlineEnd = value;
if(!inlineEndStyle)
{
- inlineEndStyle = new MarginInlineEnd();
- addStyleBead(inlineEndStyle);
+ inlineEndStyle = new MarginInlineEnd(value);
+ return addStyleBead(inlineEndStyle);
}
inlineEndStyle.value = value;
- _inlineEnd = value;
}
}
}
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
index bb4848dbfc..0e7d8b96f7 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
@@ -50,24 +50,23 @@ package org.apache.royale.style.stylebeads.spacing
public function set padding(value:*):void
{
resetPaddingStyles();
+ _padding = value;
var shorthand:Array = parseShorthandCSS(value);
if(shorthand)
{
applyShorthand(shorthand);
- _padding = value;
return;
}
- if(!paddingStyle)
- {
- paddingStyle = new Pad();
- addStyleBead(paddingStyle);
- }
- paddingStyle.value = value;
_top = value;
_right = value;
_bottom = value;
_left = value;
- _padding = value;
+ if(!paddingStyle)
+ {
+ paddingStyle = new Pad("p", "padding", value);
+ return addStyleBead(paddingStyle);
+ }
+ paddingStyle.value = value;
}
private function resetPaddingStyles():void
@@ -124,13 +123,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set top(value:*):void
{
+ _top = value;
if(!topStyle)
{
- topStyle = new PaddingTop();
- addStyleBead(topStyle);
+ topStyle = new PaddingTop(value);
+ return addStyleBead(topStyle);
}
topStyle.value = value;
- _top = value;
}
private var _right:*;
@@ -141,13 +140,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set right(value:*):void
{
+ _right = value;
if(!rightStyle)
{
- rightStyle = new PaddingRight();
- addStyleBead(rightStyle);
+ rightStyle = new PaddingRight(value);
+ return addStyleBead(rightStyle);
}
rightStyle.value = value;
- _right = value;
}
private var _bottom:*;
@@ -158,13 +157,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set bottom(value:*):void
{
+ _bottom = value;
if(!bottomStyle)
{
- bottomStyle = new PaddingBottom();
- addStyleBead(bottomStyle);
+ bottomStyle = new PaddingBottom(value);
+ return addStyleBead(bottomStyle);
}
bottomStyle.value = value;
- _bottom = value;
}
private var _left:*;
@@ -175,13 +174,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set left(value:*):void
{
+ _left = value;
if(!leftStyle)
{
- leftStyle = new PaddingLeft();
- addStyleBead(leftStyle);
+ leftStyle = new PaddingLeft(value);
+ return addStyleBead(leftStyle);
}
leftStyle.value = value;
- _left = value;
}
private var _block:*;
@@ -192,13 +191,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set block(value:*):void
{
+ _block = value;
if(!blockStyle)
{
- blockStyle = new PaddingBlock();
- addStyleBead(blockStyle);
+ blockStyle = new PaddingBlock(value);
+ return addStyleBead(blockStyle);
}
blockStyle.value = value;
- _block = value;
}
private var _blockStart:*;
@@ -209,13 +208,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set blockStart(value:*):void
{
+ _blockStart = value;
if(!blockStartStyle)
{
- blockStartStyle = new PaddingBlockStart();
- addStyleBead(blockStartStyle);
+ blockStartStyle = new PaddingBlockStart(value);
+ return addStyleBead(blockStartStyle);
}
blockStartStyle.value = value;
- _blockStart = value;
}
private var _blockEnd:*;
@@ -226,13 +225,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set blockEnd(value:*):void
{
+ _blockEnd = value;
if(!blockEndStyle)
{
- blockEndStyle = new PaddingBlockEnd();
- addStyleBead(blockEndStyle);
+ blockEndStyle = new PaddingBlockEnd(value);
+ return addStyleBead(blockEndStyle);
}
blockEndStyle.value = value;
- _blockEnd = value;
}
private var _inline:*;
@@ -243,13 +242,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inline(value:*):void
{
+ _inline = value;
if(!inlineStyle)
{
- inlineStyle = new PaddingInline();
- addStyleBead(inlineStyle);
+ inlineStyle = new PaddingInline(value);
+ return addStyleBead(inlineStyle);
}
inlineStyle.value = value;
- _inline = value;
}
private var _inlineStart:*;
@@ -260,13 +259,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inlineStart(value:*):void
{
+ _inlineStart = value;
if(!inlineStartStyle)
{
- inlineStartStyle = new PaddingInlineStart();
- addStyleBead(inlineStartStyle);
+ inlineStartStyle = new PaddingInlineStart(value);
+ return addStyleBead(inlineStartStyle);
}
inlineStartStyle.value = value;
- _inlineStart = value;
}
private var _inlineEnd:*;
@@ -277,13 +276,13 @@ package org.apache.royale.style.stylebeads.spacing
public function set inlineEnd(value:*):void
{
+ _inlineEnd = value;
if(!inlineEndStyle)
{
- inlineEndStyle = new PaddingInlineEnd();
- addStyleBead(inlineEndStyle);
+ inlineEndStyle = new PaddingInlineEnd(value);
+ return addStyleBead(inlineEndStyle);
}
inlineEndStyle.value = value;
- _inlineEnd = value;
}
}
}
\ No newline at end of file