Add scale transform and fix default prop for compound transform.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/766c76a0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/766c76a0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/766c76a0 Branch: refs/heads/spark Commit: 766c76a0ff5645126782c53056e2e9662355547d Parents: 92e6ec9 Author: yishayw <yishayj...@hotmail.com> Authored: Thu Jul 28 18:51:31 2016 +0300 Committer: yishayw <yishayj...@hotmail.com> Committed: Thu Jul 28 18:51:31 2016 +0300 ---------------------------------------------------------------------- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../apache/flex/core/TransformCompoundModel.as | 12 +++++----- .../org/apache/flex/core/TransformScaleModel.as | 24 ++++++++++++++++++++ .../Core/src/main/resources/basic-manifest.xml | 1 + 4 files changed, 32 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/766c76a0/frameworks/projects/Core/src/main/flex/CoreClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as index ed42da0..3e86f1c 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -155,6 +155,7 @@ internal class CoreClasses import org.apache.flex.core.TransformRotateModel; TransformRotateModel; import org.apache.flex.core.TransformMoveXModel; TransformMoveXModel; import org.apache.flex.core.TransformMoveYModel; TransformMoveYModel; + import org.apache.flex.core.TransformScaleModel; TransformScaleModel; import org.apache.flex.utils.CSSUtils; CSSUtils; import org.apache.flex.utils.Proxy; Proxy; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/766c76a0/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformCompoundModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformCompoundModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformCompoundModel.as index d2b3339..af7ee20 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformCompoundModel.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformCompoundModel.as @@ -2,19 +2,19 @@ package org.apache.flex.core { import org.apache.flex.geom.Matrix; + [DefaultProperty("transformModels")] public class TransformCompoundModel extends TransformModel { - private var _tranformModels:Array; + private var _transformModels:Array; - [DefaultProperty("transformModels")] - public function get tranformModels():Array + public function get transformModels():Array { - return _tranformModels; + return _transformModels; } - public function set tranformModels(value:Array):void + public function set transformModels(value:Array):void { - _tranformModels = value; + _transformModels = value; if (value && value.length > 0) { var length:int = value.length; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/766c76a0/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformScaleModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformScaleModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformScaleModel.as new file mode 100644 index 0000000..1ffe7d3 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformScaleModel.as @@ -0,0 +1,24 @@ +package org.apache.flex.core +{ + import org.apache.flex.geom.Matrix; + + public class TransformScaleModel extends TransformModel + { + private var _scale:Number + public function TransformScaleModel() + { + } + + public function get scale():Number + { + return _scale; + } + + public function set scale(value:Number):void + { + _scale = value; + matrix = new Matrix(scale, 0, 0, scale, 0, 0); + } + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/766c76a0/frameworks/projects/Core/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml b/frameworks/projects/Core/src/main/resources/basic-manifest.xml index 4958e66..95aa8b5 100644 --- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml @@ -41,6 +41,7 @@ <component id="TransformCompoundModel" class="org.apache.flex.core.TransformCompoundModel" /> <component id="TransformMoveXModel" class="org.apache.flex.core.TransformMoveXModel" /> <component id="TransformMoveYModel" class="org.apache.flex.core.TransformMoveYModel" /> + <component id="TransformScaleModel" class="org.apache.flex.core.TransformScaleModel" /> <component id="State" class="org.apache.flex.states.State"/> </componentPackage>
