This is an automated email from the ASF dual-hosted git repository. yishayw pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 6fc9e97a1c723f725f6ae2e3599b3672b1f15a37 Author: Yishay Weiss <[email protected]> AuthorDate: Fri Sep 25 11:23:27 2020 +0100 Get rid of more flash dependencies in new emulation stubs --- .../MXRoyale/src/main/royale/mx/events/RSLEvent.as | 9 +- .../spark/components/mediaClasses/ScrubBar.as | 187 +++++------ .../spark/components/mediaClasses/VolumeBar.as | 367 +++++++++++---------- .../src/main/royale/spark/effects/Fade.as | 233 +------------ .../main/royale/spark/filters/ColorMatrixFilter.as | 7 +- .../main/royale/spark/filters/DropShadowFilter.as | 13 +- 6 files changed, 301 insertions(+), 515 deletions(-) diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/RSLEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/RSLEvent.as index 8f22450..fe940ad 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/RSLEvent.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/RSLEvent.as @@ -20,10 +20,10 @@ package mx.events { -import flash.display.LoaderInfo; +//import flash.display.LoaderInfo; import org.apache.royale.events.Event; import org.apache.royale.events.ProgressEvent; -import flash.net.URLRequest; +import org.apache.royale.net.URLRequest; /** * The RSLEvent class represents an event object used by the @@ -247,7 +247,7 @@ public class RSLEvent extends ProgressEvent rslIndex:int = -1, rslTotal:int = -1, url:URLRequest = null, errorText:String = null, isResourceModule:Boolean = false, - loaderInfo:LoaderInfo = null) + loaderInfo:Object = null) { super(type, bubbles, cancelable, bytesLoaded, bytesTotal); @@ -296,7 +296,8 @@ public class RSLEvent extends ProgressEvent * The loaderInfo associated with this event. This is only set in the * RSLEvent.RSL_COMPLETE event. Otherwise loaderInfo will be null. */ - public var loaderInfo:LoaderInfo; + //public var loaderInfo:LoaderInfo; + public var loaderInfo:Object; //---------------------------------- // rslIndex diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/ScrubBar.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/ScrubBar.as index ab360ab..82be80f 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/ScrubBar.as +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/ScrubBar.as @@ -21,14 +21,16 @@ package spark.components.mediaClasses { -import flash.display.DisplayObject; -import flash.display.DisplayObjectContainer; -import flash.display.InteractiveObject; -import org.apache.royale.events.Event; +import org.apache.royale.html.Slider; +import mx.core.UIComponent; +//import flash.display.DisplayObject; +//import flash.display.DisplayObjectContainer; +//import flash.display.InteractiveObject; +//import org.apache.royale.events.Event; -import mx.core.IVisualElement; +//import mx.core.IVisualElement; -import spark.components.HSlider; +//import spark.components.HSlider; /** * The VideoScrubBar class defines a video timeline that shows the @@ -43,7 +45,7 @@ import spark.components.HSlider; * @playerversion AIR 1.5 * @productversion Flex 4 */ -public class ScrubBar extends HSlider +public class ScrubBar extends Slider { //-------------------------------------------------------------------------- @@ -64,7 +66,7 @@ public class ScrubBar extends HSlider { super(); - dataTipFormatFunction = formatTimeValue; + //dataTipFormatFunction = formatTimeValue; } //-------------------------------------------------------------------------- @@ -84,7 +86,7 @@ public class ScrubBar extends HSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - public var playedArea:IVisualElement; + public var playedArea:UIComponent; [SkinPart(required="false")] @@ -102,7 +104,7 @@ public class ScrubBar extends HSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - public var loadedRangeArea:IVisualElement; + public var loadedRangeArea:UIComponent; //-------------------------------------------------------------------------- // @@ -114,7 +116,7 @@ public class ScrubBar extends HSlider // loadedRangeEnd //--------------------------------- - private var _loadedRangeEnd:Number; + //private var _loadedRangeEnd:Number; /** * The range of currently loaded in values. This @@ -132,7 +134,8 @@ public class ScrubBar extends HSlider */ public function get loadedRangeEnd():Number { - return _loadedRangeEnd; + //return _loadedRangeEnd; + return NaN; } /** @@ -140,11 +143,11 @@ public class ScrubBar extends HSlider */ public function set loadedRangeEnd(value:Number):void { - if (value == _loadedRangeEnd) - return; - - _loadedRangeEnd = value; - invalidateDisplayList(); + //if (value == _loadedRangeEnd) + //return; + // + //_loadedRangeEnd = value; + //invalidateDisplayList(); } //-------------------------------------------------------------------------- @@ -156,56 +159,56 @@ public class ScrubBar extends HSlider /** * @private */ - override protected function partAdded(partName:String, instance:Object):void - { - super.partAdded(partName, instance); - - if (instance == playedArea) - { - if (playedArea is InteractiveObject) - InteractiveObject(playedArea).mouseEnabled = false; - if (playedArea is DisplayObjectContainer) - DisplayObjectContainer(playedArea).mouseChildren = false; - - invalidateDisplayList(); - } - else if (instance == loadedRangeArea) - { - if (loadedRangeArea is InteractiveObject) - InteractiveObject(loadedRangeArea).mouseEnabled = false; - if (loadedRangeArea is DisplayObjectContainer) - DisplayObjectContainer(loadedRangeArea).mouseChildren = false; - - invalidateDisplayList(); - } - } + //override protected function partAdded(partName:String, instance:Object):void + //{ + //super.partAdded(partName, instance); + // + //if (instance == playedArea) + //{ + //if (playedArea is InteractiveObject) + //InteractiveObject(playedArea).mouseEnabled = false; + //if (playedArea is DisplayObjectContainer) + //DisplayObjectContainer(playedArea).mouseChildren = false; + // + //invalidateDisplayList(); + //} + //else if (instance == loadedRangeArea) + //{ + //if (loadedRangeArea is InteractiveObject) + //InteractiveObject(loadedRangeArea).mouseEnabled = false; + //if (loadedRangeArea is DisplayObjectContainer) + //DisplayObjectContainer(loadedRangeArea).mouseChildren = false; + // + //invalidateDisplayList(); + //} + //} /** * @private */ - private function calculateAreaSize(value:Number):Number - { - var trackPos:Number = track.getLayoutBoundsX(); - var trackSize:Number = track.getLayoutBoundsWidth(); - var thumbSize:Number = thumb.getLayoutBoundsWidth(); - var range:Number = maximum - minimum; - var thumbPos:Number = (range > 0) ? (value - minimum) * ((trackSize - thumbSize) / range) : 0; - return thumbSize + thumbPos; - } + //private function calculateAreaSize(value:Number):Number + //{ + //var trackPos:Number = track.getLayoutBoundsX(); + //var trackSize:Number = track.getLayoutBoundsWidth(); + //var thumbSize:Number = thumb.getLayoutBoundsWidth(); + //var range:Number = maximum - minimum; + //var thumbPos:Number = (range > 0) ? (value - minimum) * ((trackSize - thumbSize) / range) : 0; + //return thumbSize + thumbPos; + //} /** * @private */ - override protected function updateSkinDisplayList():void - { - super.updateSkinDisplayList(); - - if (!thumb || !track) - return; - - sizeLoadedRangeArea(calculateAreaSize(loadedRangeEnd)); - sizePlayedArea(calculateAreaSize(pendingValue)); - } + //override protected function updateSkinDisplayList():void + //{ + //super.updateSkinDisplayList(); + // + //if (!thumb || !track) + //return; + // + //sizeLoadedRangeArea(calculateAreaSize(loadedRangeEnd)); + //sizePlayedArea(calculateAreaSize(pendingValue)); + //} /** * Sets the size of the loaded range area. @@ -219,11 +222,11 @@ public class ScrubBar extends HSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - protected function sizeLoadedRangeArea(loadedRangeAreaSize:Number):void - { - if (loadedRangeArea) - loadedRangeArea.setLayoutBoundsSize(Math.round(loadedRangeAreaSize), NaN); - } + //protected function sizeLoadedRangeArea(loadedRangeAreaSize:Number):void + //{ + //if (loadedRangeArea) + //loadedRangeArea.setLayoutBoundsSize(Math.round(loadedRangeAreaSize), NaN); + //} /** * Sets the size of the played area. @@ -237,37 +240,37 @@ public class ScrubBar extends HSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - protected function sizePlayedArea(playedAreaSize:Number):void - { - if (playedArea) - playedArea.setLayoutBoundsSize(Math.round(playedAreaSize), NaN); - } + //protected function sizePlayedArea(playedAreaSize:Number):void + //{ + //if (playedArea) + //playedArea.setLayoutBoundsSize(Math.round(playedAreaSize), NaN); + //} /** * @private */ - private function formatTimeValue(value:Number):String - { - // default format: hours:minutes:seconds - var hours:uint = Math.floor(value/3600) % 24; - var minutes:uint = Math.floor(value/60) % 60; - var seconds:uint = Math.round(value) % 60; - - var result:String = ""; - if (hours != 0) - result = hours + ":"; - - if (result && minutes < 10) - result += "0" + minutes + ":"; - else - result += minutes + ":"; - - if (seconds < 10) - result += "0" + seconds; - else - result += seconds; - - return result; - } + //private function formatTimeValue(value:Number):String + //{ + //// default format: hours:minutes:seconds + //var hours:uint = Math.floor(value/3600) % 24; + //var minutes:uint = Math.floor(value/60) % 60; + //var seconds:uint = Math.round(value) % 60; + // + //var result:String = ""; + //if (hours != 0) + //result = hours + ":"; + // + //if (result && minutes < 10) + //result += "0" + minutes + ":"; + //else + //result += minutes + ":"; + // + //if (seconds < 10) + //result += "0" + seconds; + //else + //result += seconds; + // + //return result; + //} } } diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/VolumeBar.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/VolumeBar.as index a11f39e..be10931 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/VolumeBar.as +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/mediaClasses/VolumeBar.as @@ -20,29 +20,31 @@ package spark.components.mediaClasses { -import flash.display.DisplayObject; -import org.apache.royale.events.Event; -import org.apache.royale.events.FocusEvent; -import org.apache.royale.events.KeyboardEvent; -import org.apache.royale.events.MouseEvent; -import org.apache.royale.geom.Point; -import flash.ui.Keyboard; -import flash.ui.Mouse; -import mx.collections.IList; -import mx.core.IUIComponent; +import org.apache.royale.html.Slider; +//import flash.display.DisplayObject; +//import org.apache.royale.events.Event; +//import org.apache.royale.events.FocusEvent; +//import org.apache.royale.events.KeyboardEvent; +//import org.apache.royale.events.MouseEvent; +//import org.apache.royale.geom.Point; +//import flash.ui.Keyboard; +//import flash.ui.Mouse; +// +//import mx.collections.IList; +//import mx.core.IUIComponent; import mx.core.UIComponent; -import mx.core.mx_internal; -import mx.events.CollectionEvent; -import mx.events.FlexEvent; -import mx.managers.LayoutManager; - -import spark.components.VSlider; -import spark.components.supportClasses.ButtonBase; -import spark.components.supportClasses.DropDownController; -import spark.components.supportClasses.ListBase; -import spark.events.DropDownEvent; -import spark.utils.LabelUtil; +//import mx.core.mx_internal; +//import mx.events.CollectionEvent; +//import mx.events.FlexEvent; +//import mx.managers.LayoutManager; +// +//import spark.components.VSlider; +//import spark.components.supportClasses.ButtonBase; +//import spark.components.supportClasses.DropDownController; +//import spark.components.supportClasses.ListBase; +//import spark.events.DropDownEvent; +//import spark.utils.LabelUtil; use namespace mx_internal; @@ -140,7 +142,7 @@ use namespace mx_internal; * @playerversion AIR 1.5 * @productversion Flex 4 */ -public class VolumeBar extends VSlider +public class VolumeBar extends Slider { //-------------------------------------------------------------------------- @@ -161,12 +163,12 @@ public class VolumeBar extends VSlider { super(); - dropDownController = new DropDownController(); + //dropDownController = new DropDownController(); // add change listener so we know when the user has interacted // with the volume bar to change the value so we can automatically // unmute the volume when the user does that. - addEventListener(Event.CHANGE, changeHandler); + //addEventListener(Event.CHANGE, changeHandler); } //-------------------------------------------------------------------------- @@ -184,7 +186,8 @@ public class VolumeBar extends VSlider * @productversion Flex 4 */ [SkinPart(required="false")] - public var muteButton:MuteButton; + //public var muteButton:MuteButton; + public var muteButton:UIComponent; /** @@ -211,7 +214,7 @@ public class VolumeBar extends VSlider // dropDownController //---------------------------------- - private var _dropDownController:DropDownController; + //private var _dropDownController:DropDownController; /** * Instance of the DropDownController class that handles all of the mouse, keyboard @@ -222,31 +225,31 @@ public class VolumeBar extends VSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - protected function get dropDownController():DropDownController - { - return _dropDownController; - } + //protected function get dropDownController():DropDownController + //{ + //return _dropDownController; + //} /** * @private */ - protected function set dropDownController(value:DropDownController):void - { - if (_dropDownController == value) - return; - - _dropDownController = value; - - _dropDownController.addEventListener(DropDownEvent.OPEN, dropDownController_openHandler); - _dropDownController.addEventListener(DropDownEvent.CLOSE, dropDownController_closeHandler); - - _dropDownController.rollOverOpenDelay = getStyle("rollOverOpenDelay"); - - if (muteButton) - _dropDownController.openButton = muteButton; - if (dropDown) - _dropDownController.dropDown = dropDown; - } + //protected function set dropDownController(value:DropDownController):void + //{ + //if (_dropDownController == value) + //return; + // + //_dropDownController = value; + // + //_dropDownController.addEventListener(DropDownEvent.OPEN, dropDownController_openHandler); + //_dropDownController.addEventListener(DropDownEvent.CLOSE, dropDownController_closeHandler); + // + //_dropDownController.rollOverOpenDelay = getStyle("rollOverOpenDelay"); + // + //if (muteButton) + //_dropDownController.openButton = muteButton; + //if (dropDown) + //_dropDownController.dropDown = dropDown; + //} //---------------------------------- // isDropDownOpen @@ -262,10 +265,11 @@ public class VolumeBar extends VSlider */ public function get isDropDownOpen():Boolean { - if (dropDownController) - return dropDownController.isOpen; - else - return false; + //if (dropDownController) + //return dropDownController.isOpen; + //else + //return false; + return false; } //---------------------------------- @@ -290,7 +294,8 @@ public class VolumeBar extends VSlider */ public function get muted():Boolean { - return _muted; + //return _muted; + return false; } /** @@ -298,19 +303,19 @@ public class VolumeBar extends VSlider */ public function set muted(value:Boolean):void { - if (_muted == value) - return; - - _muted = value; - - // invalidateDisplayList() because we take in to account value and muted when - // determining where to draw the thumb on the track. - invalidateDisplayList(); - - if (muteButton) - muteButton.muted = value; - - dispatchEvent(new FlexEvent(FlexEvent.MUTED_CHANGE)); + //if (_muted == value) + //return; + // + //_muted = value; + // + //// invalidateDisplayList() because we take in to account value and muted when + //// determining where to draw the thumb on the track. + //invalidateDisplayList(); + // + //if (muteButton) + //muteButton.muted = value; + // + //dispatchEvent(new FlexEvent(FlexEvent.MUTED_CHANGE)); } //-------------------------------------------------------------------------- @@ -326,9 +331,11 @@ public class VolumeBar extends VSlider /** * @private */ - override public function get baselinePosition():Number + //override public function get baselinePosition():Number + public function get baselinePosition():Number { - return getBaselinePositionForPart(muteButton); + //return getBaselinePositionForPart(muteButton); + return NaN; } //-------------------------------------------------------------------------- @@ -342,131 +349,133 @@ public class VolumeBar extends VSlider * Overridden to handle the muted case where the value's not actually changed, * but we want it to show up as 0. */ - override protected function updateSkinDisplayList():void - { - if (!thumb || !track) - return; - - var thumbRange:Number = track.getLayoutBoundsHeight() - thumb.getLayoutBoundsHeight(); - var range:Number = maximum - minimum; - - // calculate new thumb position. - var thumbPosTrackY:Number; - - // if muted, it's 0. otherwise, calculate it normally - // TODO (rfrishbe): should probably use setValue(0) and listen for CHANGE on the VideoPlayer - // instead of VALUE_COMMIT. - if (!muted) - thumbPosTrackY = (range > 0) ? thumbRange - (((pendingValue - minimum) / range) * thumbRange) : 0; - else - thumbPosTrackY = thumbRange; - - // convert to parent's coordinates. - var thumbPos:Point = track.localToGlobal(new Point(0, thumbPosTrackY)); - var thumbPosParentY:Number = thumb.parent.globalToLocal(thumbPos).y; - - thumb.setLayoutBoundsPosition(thumb.getLayoutBoundsX(), Math.round(thumbPosParentY)); - } + //override protected function updateSkinDisplayList():void + //{ + //if (!thumb || !track) + //return; + // + //var thumbRange:Number = track.getLayoutBoundsHeight() - thumb.getLayoutBoundsHeight(); + //var range:Number = maximum - minimum; + // + //// calculate new thumb position. + //var thumbPosTrackY:Number; + // + //// if muted, it's 0. otherwise, calculate it normally + //// TODO (rfrishbe): should probably use setValue(0) and listen for CHANGE on the VideoPlayer + //// instead of VALUE_COMMIT. + //if (!muted) + //thumbPosTrackY = (range > 0) ? thumbRange - (((pendingValue - minimum) / range) * thumbRange) : 0; + //else + //thumbPosTrackY = thumbRange; + // + //// convert to parent's coordinates. + //var thumbPos:Point = track.localToGlobal(new Point(0, thumbPosTrackY)); + //var thumbPosParentY:Number = thumb.parent.globalToLocal(thumbPos).y; + // + //thumb.setLayoutBoundsPosition(thumb.getLayoutBoundsX(), Math.round(thumbPosParentY)); + //} /** * @private */ - override public function styleChanged(styleProp:String):void + //override public function styleChanged(styleProp:String):void + public function styleChanged(styleProp:String):void { - super.styleChanged(styleProp); - var allStyles:Boolean = (styleProp == null || styleProp == "styleName"); - - if (allStyles || styleProp == "rollOverOpenDelay") - { - if (dropDownController) - dropDownController.rollOverOpenDelay = getStyle("rollOverOpenDelay"); - } + //super.styleChanged(styleProp); + //var allStyles:Boolean = (styleProp == null || styleProp == "styleName"); + // + //if (allStyles || styleProp == "rollOverOpenDelay") + //{ + //if (dropDownController) + //dropDownController.rollOverOpenDelay = getStyle("rollOverOpenDelay"); + //} } /** * @private */ - override protected function setValue(value:Number):void - { - super.setValue(value); - - if (muteButton) - muteButton.volume = value; - } + //override protected function setValue(value:Number):void + //{ + //super.setValue(value); + // + //if (muteButton) + //muteButton.volume = value; + //} /** * @private */ - override protected function getCurrentSkinState():String - { - return !enabled ? "disabled" : dropDownController.isOpen ? "open" : "normal"; - } + //override protected function getCurrentSkinState():String + //{ + //return !enabled ? "disabled" : dropDownController.isOpen ? "open" : "normal"; + //} /** * @private */ - override protected function partAdded(partName:String, instance:Object):void - { - super.partAdded(partName, instance); - - if (instance == muteButton) - { - if (dropDownController) - dropDownController.openButton = muteButton; - - muteButton.addEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler); - muteButton.volume = value; - muteButton.muted = muted; - } - else if (instance == dropDown && dropDownController) - { - dropDownController.dropDown = dropDown; - } - } + //override protected function partAdded(partName:String, instance:Object):void + //{ + //super.partAdded(partName, instance); + // + //if (instance == muteButton) + //{ + //if (dropDownController) + //dropDownController.openButton = muteButton; + // + //muteButton.addEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler); + //muteButton.volume = value; + //muteButton.muted = muted; + //} + //else if (instance == dropDown && dropDownController) + //{ + //dropDownController.dropDown = dropDown; + //} + //} /** * @private */ - override protected function partRemoved(partName:String, instance:Object):void - { - if (instance == muteButton) - { - muteButton.removeEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler); - } - else if (instance == dropDownController) - { - if (instance == muteButton) - dropDownController.openButton = null; - - if (instance == dropDown) - dropDownController.dropDown = null; - } - - super.partRemoved(partName, instance); - } + //override protected function partRemoved(partName:String, instance:Object):void + //{ + //if (instance == muteButton) + //{ + //muteButton.removeEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler); + //} + //else if (instance == dropDownController) + //{ + //if (instance == muteButton) + //dropDownController.openButton = null; + // + //if (instance == dropDown) + //dropDownController.dropDown = null; + //} + // + //super.partRemoved(partName, instance); + //} /** * @private * On focus, pop open the drop down and validate everything so * we can draw focus on one of the drop-down parts (the thumb) */ + //override public function setFocus():void override public function setFocus():void { - openDropDown(); - LayoutManager.getInstance().validateNow(); - super.setFocus(); + //openDropDown(); + //LayoutManager.getInstance().validateNow(); + //super.setFocus(); } /** * @private */ - override protected function focusOutHandler(event:FocusEvent):void - { - dropDownController.processFocusOut(event); - - super.focusOutHandler(event); - } + //override protected function focusOutHandler(event:FocusEvent):void + //{ + //dropDownController.processFocusOut(event); +// + //super.focusOutHandler(event); + //} //-------------------------------------------------------------------------- // @@ -484,7 +493,7 @@ public class VolumeBar extends VSlider */ public function openDropDown():void { - dropDownController.openDropDown(); + //dropDownController.openDropDown(); } /** @@ -500,7 +509,7 @@ public class VolumeBar extends VSlider */ public function closeDropDown(commit:Boolean):void { - dropDownController.closeDropDown(commit); + //dropDownController.closeDropDown(commit); } //-------------------------------------------------------------------------- @@ -535,39 +544,39 @@ public class VolumeBar extends VSlider * @playerversion AIR 1.5 * @productversion Flex 4 */ - mx_internal function dropDownController_closeHandler(event:DropDownEvent):void - { - invalidateSkinState(); - - // In this implementation, the volume is always changed immediately, - // so no need to handle the case when - // commit==false and event.preventDefault() is called on this DropDownEvent - - dispatchEvent(event); - } + //mx_internal function dropDownController_closeHandler(event:DropDownEvent):void + //{ + //invalidateSkinState(); + // + //// In this implementation, the volume is always changed immediately, + //// so no need to handle the case when + //// commit==false and event.preventDefault() is called on this DropDownEvent + // + //dispatchEvent(event); + //} /** * @private * When the value is changed via a user-interaction, we will * automatically unmute the volume */ - private function changeHandler(event:Event):void - { - // when the value is set, this volume bar unmutes the - // video player automatically - if (muted) - muted = false; - } + //private function changeHandler(event:Event):void + //{ + //// when the value is set, this volume bar unmutes the + //// video player automatically + //if (muted) + //muted = false; + //} /** * @private * When the mute button changes the muted value, we need to change * our own. */ - private function muteButton_mutedChangeHandler(event:FlexEvent):void - { - muted = muteButton.muted; - } + //private function muteButton_mutedChangeHandler(event:FlexEvent):void + //{ + //muted = muteButton.muted; + //} } } diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/effects/Fade.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/effects/Fade.as index af9a0e0..4bd609d 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/effects/Fade.as +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/effects/Fade.as @@ -19,239 +19,10 @@ package spark.effects { -import flash.display.DisplayObject; -import flash.display.MovieClip; +import mx.effects.Fade; -import mx.core.IVisualElement; -import mx.core.IVisualElementContainer; -import mx.core.mx_internal; -import mx.effects.IEffectInstance; -import spark.effects.supportClasses.FadeInstance; - -use namespace mx_internal; - -/** - * The Fade effect animates the <code>alpha</code> property of a component. - * If played manually (outside of a transition) on an object whose - * <code>visible</code> property is set to false, and told to animate - * <code>alpha</code> from zero to a nonzero value, it will set <code>visible</code> - * to true as a side-effect of fading it in. When run as part of a - * transition, it will respect state-specified values, but may use - * the <code>visible</code> property as well as whether the object - * is parented in the before/after states to determine the - * values to animate <code>alpha</code> from and to if <code>alphaFrom</code> - * and <code>alphaTo</code> are not specified for the effect. - * - * @mxml - * - * <p>The <code><s:Fade></code> tag - * inherits the tag attributes of its superclass, - * and adds the following tag attributes:</p> - * - * <pre> - * <s:Fade - * id="ID" - * alphaFrom="val" - * alphaTo="val" - * /> - * </pre> - * - * @see spark.effects.supportClasses.FadeInstance - * - * @includeExample examples/FadeEffectExample.mxml - * - * @langversion 3.0 - * @playerversion Flash 10 - * @playerversion AIR 1.5 - * @productversion Flex 4 - */ -public class Fade extends Animate +public class Fade extends mx.effects.Fade { - /** - * Constructor. - * - * @param target The Object to animate with this effect. - * - * @langversion 3.0 - * @playerversion Flash 10 - * @playerversion AIR 1.5 - * @productversion Flex 4 - */ - public function Fade(target:Object=null) - { - super(target); - instanceClass = FadeInstance; - } - - //-------------------------------------------------------------------------- - // - // Properties - // - //-------------------------------------------------------------------------- - - //---------------------------------- - // alphaFrom - //---------------------------------- - - [Inspectable(category="General", defaultValue="undefined", minValue="0.0", maxValue="1.0")] - - /** - * Initial value of the <code>alpha</code> property, between 0.0 and 1.0, - * where 0.0 means transparent and 1.0 means fully opaque. - * - * <p>If the effect causes the target component to disappear, - * the default value is the current value of the target's - * <code>alpha</code> property. - * If the effect causes the target component to appear, - * the default value is 0.0.</p> - * - * @langversion 3.0 - * @playerversion Flash 10 - * @playerversion AIR 1.5 - * @productversion Flex 4 - */ - public var alphaFrom:Number; - - //---------------------------------- - // alphaTo - //---------------------------------- - - [Inspectable(category="General", defaultValue="NaN", minValue="0.0", maxValue="1.0")] - - /** - * Final value of the <code>alpha</code> property, between 0.0 and 1.0, - * where 0.0 means transparent and 1.0 means fully opaque. - * - * <p>If the effect causes the target component to disappear, - * the default value is 0.0. - * If the effect causes the target component to appear, - * the default value is the current value of the target's - * <code>alpha</code> property.</p> - * - * @langversion 3.0 - * @playerversion Flash 10 - * @playerversion AIR 1.5 - * @productversion Flex 4 - */ - public var alphaTo:Number; - - - //-------------------------------------------------------------------------- - // - // Methods - // - //-------------------------------------------------------------------------- - - /** - * @private - */ - override protected function initInstance(instance:IEffectInstance):void - { - super.initInstance(instance); - - var fadeInstance:FadeInstance = FadeInstance(instance); - - fadeInstance.alphaFrom = alphaFrom; - fadeInstance.alphaTo = alphaTo; - } - - /** - * @private - */ - override public function getAffectedProperties():Array /* of String */ - { - return ["alpha", "visible", "parent", "index", - "explicitWidth", "explicitHeight", "rotation", "x", "y", - "left", "right", "top", "bottom", - "percentWidth", "percentHeight"]; - } - - /** - * @private - */ - override protected function getValueFromTarget(target:Object, property:String):* - { - // We track 'index' for use in the addDisappearingTarget() function in - // AnimateInstance, in order to add the item in the correct order - if (property == "index" && "parent" in target) - { - var container:* = target.parent; - // if the target has no parent, return undefined for index to indicate that - // it has no index value. - if (container === undefined || container === null || - ("mask" in container && container.mask == target)) - return undefined; - if (container is IVisualElementContainer) - return IVisualElementContainer(container). - getElementIndex(target as IVisualElement); - else if ("getChildIndex" in container) - return container.getChildIndex(target); - } - - return super.getValueFromTarget(target, property); - } - - /** - * @private - * This override handles the case caused by transition interruption - * where the target object may not have reached its final fade-in value, or - * may not have had the end value of '1' applied correctly because the - * transition was interrupted and the animation stopped. The logic - * checks to see whether the object was being faded in or out, based on - * the 'visible' or 'parent' properties. It then sets the end alpha to either - * the proper state value (the typical case) or to 1 (as a backup). - * Note that a faded-out object due to going away or becoming invisible - * should still have an alpha value of 1; it just won't be visible because - * it is either invisible or has no parent. But we want the alpha value - * to be opaque the next time it is made visible. - */ - override mx_internal function applyEndValues(propChanges:Array, - targets:Array):void - { - super.applyEndValues(propChanges, targets); - if (transitionInterruption && propChanges) - { - var n:int = propChanges.length; - for (var i:int = 0; i < n; i++) - { - var target:Object = propChanges[i].target; - if (this.targets.indexOf(target ) >= 0 && - (propChanges[i].start["parent"] !== undefined && - propChanges[i].end["parent"] !== undefined && - propChanges[i].start["parent"] != propChanges[i].end["parent"]) || - (propChanges[i].start["visible"] !== undefined && - propChanges[i].end["visible"] !== undefined && - propChanges[i].start["visible"] != propChanges[i].end["visible"])) - { - target.alpha = (propChanges[i].end["alpha"] !== undefined) ? - propChanges[i].end["alpha"] : 1; - } - } - } - } - - /** - * @private - */ - override protected function applyValueToTarget(target:Object, - property:String, - value:*, - props:Object):void - { - // We only want to track "parent" as it affects how - // we fade; we don't actually want to change target properties - // other than alpha or visibility - if (property == "parent" || property == "index" || - property == "explicitWidth" || property == "explicitHeight" || - property == "percentWidth" || property == "percentHeight" || - property == "rotation" || property == "x" || property == "y" || - property == "left" || property == "right" || property == "top" || property == "bottom") - { - return; - } - - super.applyValueToTarget(target, property, value, props); - } } } diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/ColorMatrixFilter.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/ColorMatrixFilter.as index 233f6d1..f7d6781 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/ColorMatrixFilter.as +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/ColorMatrixFilter.as @@ -20,7 +20,7 @@ package spark.filters { import flash.filters.BitmapFilter; -import flash.filters.ColorMatrixFilter; +//import flash.filters.ColorMatrixFilter; import mx.filters.BaseFilter; import mx.filters.IBitmapFilter; /** @@ -135,9 +135,10 @@ public class ColorMatrixFilter extends BaseFilter implements IBitmapFilter * @productversion Flex 4 */ - public function clone():BitmapFilter + public function clone():Object { - return new flash.filters.ColorMatrixFilter(_matrix); + //return new flash.filters.ColorMatrixFilter(_matrix); + return null; } } diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/DropShadowFilter.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/DropShadowFilter.as index fd7177b..28a726c 100644 --- a/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/DropShadowFilter.as +++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/filters/DropShadowFilter.as @@ -19,8 +19,8 @@ package spark.filters { -import flash.filters.BitmapFilter; -import flash.filters.DropShadowFilter; +//import flash.filters.BitmapFilter; +//import flash.filters.DropShadowFilter; import mx.filters.BaseDimensionFilter; import mx.filters.IBitmapFilter; @@ -349,11 +349,12 @@ public class DropShadowFilter extends BaseDimensionFilter implements IBitmapFilt * @productversion Flex 4 */ - public function clone():BitmapFilter + public function clone():Object { - return new flash.filters.DropShadowFilter(distance, angle, color, alpha, blurX, - blurY, strength, quality, inner, - knockout, hideObject); + return null; + //return new flash.filters.DropShadowFilter(distance, angle, color, alpha, blurX, + //blurY, strength, quality, inner, + //knockout, hideObject); } }
