You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/15 00:54:29 UTC
[royale-asjs] branch develop updated: jewel-icons: we need to
extend the IIcon interface for incoming Jewel IconButtonBar
This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 d44ae65 jewel-icons: we need to extend the IIcon interface for incoming Jewel IconButtonBar
d44ae65 is described below
commit d44ae65cc5f5db51ceaf680e166ed6a3f6b3924f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Dec 15 01:54:20 2019 +0100
jewel-icons: we need to extend the IIcon interface for incoming Jewel IconButtonBar
---
.../src/main/royale/org/apache/royale/core/IIcon.as | 20 ++++++++++++++++++++
.../main/royale/org/apache/royale/icons/FontIcon.as | 9 ++-------
.../royale/org/apache/royale/icons/FontIconBase.as | 18 ++++++++++++++++++
3 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IIcon.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IIcon.as
index e28a52e..c807bdd 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IIcon.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IIcon.as
@@ -28,6 +28,26 @@ package org.apache.royale.core
*/
public interface IIcon extends IUIBase
{
+ /**
+ * The text of the icon
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.3
+ */
+ function get text():String;
+ function set text(value:String):void;
+ /**
+ * Use the Material Icons
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get material():Boolean;
+ function set material(value:Boolean):void;
}
}
diff --git a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIcon.as b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIcon.as
index 2d1e2c4..ca03527 100644
--- a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIcon.as
+++ b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIcon.as
@@ -46,7 +46,6 @@ package org.apache.royale.icons
typeNames = "fonticon";
}
- protected var _text:String = "";
/**
* The text of the icon
*
@@ -55,13 +54,9 @@ package org.apache.royale.icons
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public function get text():String
+ override public function set text(value:String):void
{
- return _text;
- }
- public function set text(value:String):void
- {
- _text = value;
+ super.text = value;
COMPILE::JS
{
diff --git a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as
index 7bcbfb8..bb1236c 100644
--- a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as
+++ b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as
@@ -54,6 +54,24 @@ package org.apache.royale.icons
typeNames = "";
}
+ protected var _text:String = "";
+ /**
+ * The text of the icon
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public function get text():String
+ {
+ return _text;
+ }
+ public function set text(value:String):void
+ {
+ _text = value;
+ }
+
COMPILE::JS
protected var textNode:Text;