You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@royale.apache.org by GitBox <gi...@apache.org> on 2018/09/25 11:15:43 UTC
[GitHub] alinakazi closed pull request #301: Changes on 25 sep 2018
alinakazi closed pull request #301: Changes on 25 sep 2018
URL: https://github.com/apache/royale-asjs/pull/301
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 26695da8c..141ffbeef 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -532,6 +532,21 @@ public class UIComponent extends UIBase
{
}
+
+ //----------------------------------
+ // mouseFocusEnabled
+ //----------------------------------
+
+ public function get mouseFocusEnabled():Boolean
+ {
+ return false;
+ }
+ public function set mouseFocusEnabled(value:Boolean):void
+ {
+
+ }
+
+
//----------------------------------
// initialized
//----------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/Stroke.as b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/Stroke.as
index 903528292..0081838e2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/Stroke.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/Stroke.as
@@ -71,7 +71,7 @@ import org.apache.royale.graphics.SolidColorStroke;
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
-public class Stroke extends org.apache.royale.graphics.SolidColorStroke
+public class Stroke extends org.apache.royale.graphics.SolidColorStroke implements IStroke
{
/* include "../core/Version.as";
*/
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/primitives/Line.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/primitives/Line.as
index e84140e79..0d30dbe77 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/primitives/Line.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/primitives/Line.as
@@ -31,6 +31,7 @@ import org.apache.royale.events.EventDispatcher;
import mx.core.mx_internal;
import mx.graphics.IStroke;
import mx.graphics.IFill;
+import org.apache.royale.core.UIBase;
use namespace mx_internal;
@@ -49,7 +50,7 @@ use namespace mx_internal;
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
-public class Line extends EventDispatcher
+public class Line extends UIBase
{ //extends StrokedElement
// include "../core/Version.as";
@@ -316,263 +317,7 @@ public class Line extends EventDispatcher
}
} */
- //----------------------------------
- // height copied from GraphicElement
- //----------------------------------
-
- /**
- * @private
- * Storage for the height property.
- */
- /* mx_internal */ private var _height:Number = 0;
-
- [Bindable("propertyChange")]
- [Inspectable(category="General")]
- [PercentProxy("percentHeight")]
-
- /**
- * The height of the graphic element.
- *
- * @default 0
- *
- * @langversion 3.0
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @productversion Royale 0.9.4
- * @royalesuppresspublicvarwarning
- */
- public function get height():Number
- {
- return _height;
- }
-
- /**
- * @private
- */
-
- public function set height(value:Number):void
- {
- // explicitHeight = value;
-
- if (_height == value)
- return;
-
- var oldValue:Number = _height;
- _height = value;
- // dispatchPropertyChangeEvent("height", oldValue, value);
-
- // Invalidate the display list, since we're changing the actual height
- // and we're not going to correctly detect whether the layout sets
- // new actual height different from our previous value.
- // invalidateDisplayList();
- }
-
- //----------------------------------
- // visible copied from GraphicElement
- //----------------------------------
-
- /**
- * @private
- * Storage for the visible property.
- */
- private var _visible:Boolean = true;
-
-
- /**
- * @private
- * The actual 'effective' visibility of this
- * element, one that considers the visibility of
- * the owning design layer parent (if any).
- */
- // protected var _effectiveVisibility:Boolean = true;
-
- /**
- * @private
- */
- // private var visibleChanged:Boolean;
-
- [Inspectable(category="General")]
-
- /**
- * @inheritDoc
- *
- * @langversion 3.0
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @productversion Royale 0.9.4
- * @royalesuppresspublicvarwarning
- */
- public function get visible():Boolean
- {
- return _visible;
- }
-
- /**
- * @private
- */
- public function set visible(value:Boolean):void
- {
- _visible = value;
-
- /* if (designLayer && !designLayer.effectiveVisibility)
- value = false;
-
- if (_effectiveVisibility == value)
- return;
-
- _effectiveVisibility = value;
- visibleChanged = true;
- invalidateProperties(); */
- }
-
- //----------------------------------
- // width copied from GraphicElement
- //----------------------------------
-
- /**
- * @private
- * Storage for the width property.
- */
- /* mx_internal */ private var _width:Number = 0;
-
- [Bindable("propertyChange")]
- [Inspectable(category="General")]
- [PercentProxy("percentWidth")]
-
- /**
- * The width of the graphic element.
- *
- * @default 0
- *
- * @langversion 3.0
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @productversion Royale 0.9.4
- * @royalesuppresspublicvarwarning
- */
- public function get width():Number
- {
- return _width;
- }
-
- /**
- * @private
- */
- public function set width(value:Number):void
- {
- // explicitWidth = value;
-
- if (_width == value)
- return;
-
- var oldValue:Number = _width;
- _width = value;
-
- // The width is needed for the mirroring transform.
- /* if (layoutFeatures)
- {
- layoutFeatures.layoutWidth = value;
- invalidateTransform();
- }
-
- dispatchPropertyChangeEvent("width", oldValue, value);
-
- // Invalidate the display list, since we're changing the actual width
- // and we're not going to correctly detect whether the layout sets
- // new actual width different from our previous value.
- invalidateDisplayList(); */
- }
-
-
- /**
- * @private
- * storage for the x property. This property is used when a GraphicElement has a simple transform.
- */
- private var _x:Number = 0;
-
- /**
- * @private
- * storage for the y property. This property is used when a GraphicElement has a simple transform.
- */
- private var _y:Number = 0;
-
- //----------------------------------
- // x Copied From GraphicElement
- //----------------------------------
-
- [Bindable("propertyChange")]
- [Inspectable(category="General")]
-
- /**
- * The x position of the graphic element.
- *
- * @langversion 3.0
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @productversion Flex 4
- */
- public function get x():Number
- {
- // return (layoutFeatures == null)? _x:layoutFeatures.layoutX;
- return 0;
- }
-
- /**
- * @private
- */
- public function set x(value:Number):void
- {
- /* var oldValue:Number = x;
- if (oldValue == value)
- return;
-
- if (layoutFeatures != null)
- layoutFeatures.layoutX = value;
- else
- _x = value;
-
- dispatchPropertyChangeEvent("x", oldValue, value);
- invalidateTransform(false); */
- }
-
- //----------------------------------
- // y Copied From GraphicElement
- //----------------------------------
-
- [Bindable("propertyChange")]
- [Inspectable(category="General")]
-
- /**
- * The y position of the graphic element.
- *
- * @langversion 3.0
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @productversion Flex 4
- */
- public function get y():Number
- {
- // return (layoutFeatures == null)? _y:layoutFeatures.layoutY;
- return 0;
- }
-
- /**
- * @private
- */
- public function set y(value:Number):void
- {
- /* var oldValue:Number = y;
- if (oldValue == value)
- return;
-
- if (layoutFeatures != null)
- layoutFeatures.layoutY = value;
- else
- _y = value;
- dispatchPropertyChangeEvent("y", oldValue, value);
- invalidateTransform(false); */
- }
//----------------------------------
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services