Repository: flex-sdk Updated Branches: refs/heads/release4.14.0 f6c82a967 -> 43562e93d
Fixes the default rotationInterval Mustella test. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/43562e93 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/43562e93 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/43562e93 Branch: refs/heads/release4.14.0 Commit: 43562e93d099432c439cf0ed27524abc5181b1fe Parents: f6c82a9 Author: OmPrakash Muppirala <[email protected]> Authored: Tue Dec 30 17:46:01 2014 -0800 Committer: OmPrakash Muppirala <[email protected]> Committed: Tue Dec 30 17:46:01 2014 -0800 ---------------------------------------------------------------------- frameworks/projects/mobiletheme/defaults.css | 1 + .../src/spark/skins/mobile/BusyIndicatorSkin.as | 6 ++++++ .../spark/src/spark/components/BusyIndicator.as | 14 +++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/43562e93/frameworks/projects/mobiletheme/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css index 6e0edee..b6f425e 100644 --- a/frameworks/projects/mobiletheme/defaults.css +++ b/frameworks/projects/mobiletheme/defaults.css @@ -102,6 +102,7 @@ ActionBar.beveled Group#actionGroup Button.emphasized BusyIndicator { skinClass: ClassReference("spark.skins.mobile.BusyIndicatorSkin"); + rotationInterval: 50; } Button http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/43562e93/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as index 194e222..4d553ba 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as @@ -239,6 +239,12 @@ package spark.skins.mobile return diameter; } + override protected function layoutContents(unscaledWidth:Number, unscaledHeight:Number):void + { + measuredHeight = unscaledHeight; + measuredWidth = unscaledWidth; + } + /** * @private * http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/43562e93/frameworks/projects/spark/src/spark/components/BusyIndicator.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/BusyIndicator.as b/frameworks/projects/spark/src/spark/components/BusyIndicator.as index a78ac8e..f9893d8 100644 --- a/frameworks/projects/spark/src/spark/components/BusyIndicator.as +++ b/frameworks/projects/spark/src/spark/components/BusyIndicator.as @@ -21,6 +21,7 @@ package spark.components { import flash.events.Event; + import mx.core.DesignLayer; import mx.core.IUIComponent; import mx.core.IVisualElement; import mx.core.mx_internal; @@ -146,7 +147,7 @@ package spark.components new State({name:"notRotatingState"}), new State({name:"rotatingState"}) ]; - //mx_internal::skinDestructionPolicy = "auto"; + mx_internal::skinDestructionPolicy = "auto"; } override protected function commitProperties():void @@ -192,6 +193,14 @@ package spark.components invalidateProperties(); } + override public function set designLayer(value:DesignLayer):void + { + super.designLayer = value; + + effectiveVisibilityChanged = true; + invalidateProperties(); + } + private function addedToStageHandler(event:Event):void { // Check our visibility here since we haven't added @@ -201,8 +210,8 @@ package spark.components if (canRotate()) currentState = "rotatingState"; - invalidateSkinState(); addVisibilityListeners(); + invalidateSkinState(); } private function removedFromStageHandler(event:Event):void @@ -212,7 +221,6 @@ package spark.components removeEventListener(Event.ADDED_TO_STAGE, addedToStageHandler); removeEventListener(Event.REMOVED_FROM_STAGE, removedFromStageHandler); removeVisibilityListeners(); - detachSkin(); invalidateSkinState(); }
