You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2020/01/16 08:06:37 UTC
[royale-asjs] branch develop updated: implement
contentBackgroundColor on SkinnableTextInput and color on UIComponent
This is an automated email from the ASF dual-hosted git repository.
aharui 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 bc91fb3 implement contentBackgroundColor on SkinnableTextInput and color on UIComponent
bc91fb3 is described below
commit bc91fb33e15a8121ac9a7cde290655d0f12ca066
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jan 16 00:06:19 2020 -0800
implement contentBackgroundColor on SkinnableTextInput and color on UIComponent
---
.../MXRoyale/src/main/royale/mx/core/UIComponent.as | 10 +++++++---
.../components/supportClasses/SkinnableTextBase.as | 21 +++++++++++++++------
2 files changed, 22 insertions(+), 9 deletions(-)
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 75c84dc..57a6ea6 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -4825,12 +4825,16 @@ COMPILE::JS
*/
public function get color():Object
{
- trace("color not implemented");
- return 0;
+ return getStyle("color");
}
public function set color(value:Object):void
{
- trace("color not implemented");
+ if (value is String && value.charAt(0) != '#')
+ {
+ var c:uint = parseInt(value as String);
+ value = '#' + c.toString(16);
+ }
+ setStyle("color", value);
}
[Inspectable(category="General")]
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
index f442b8e..4d262d3 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
@@ -49,17 +49,17 @@ import spark.core.IProxiedStageTextWrapper;
import spark.core.ISoftKeyboardHintClient;
import spark.events.TextOperationEvent;
*/
-import org.apache.royale.html.accessories.PasswordInputBead;
-import org.apache.royale.textLayout.elements.TextFlow;
+import mx.core.mx_internal;
+import mx.managers.IFocusManagerComponent;
import mx.utils.BitFlagUtil;
import spark.components.RichEditableText;
import spark.core.IEditableText;
-
-import mx.managers.IFocusManagerComponent;
+
import org.apache.royale.events.Event;
import org.apache.royale.events.MouseEvent;
-import mx.core.mx_internal;
+import org.apache.royale.html.accessories.PasswordInputBead;
+import org.apache.royale.textLayout.elements.TextFlow;
use namespace mx_internal;
@@ -469,10 +469,12 @@ public class SkinnableTextBase extends SkinnableComponent
public function get contentBackgroundColor():uint
{
- return 0;
+ return getStyle("backgroundColor");
}
+
public function set contentBackgroundColor(val:uint):void
{
+ setStyle("contentBackgroundColor", val);
}
public function get contentBackgroundAlpha():Number
@@ -2878,7 +2880,14 @@ public class SkinnableTextBase extends SkinnableComponent
override public function setStyle(styleName:String, value:*):void
{
if (styleName == "contentBackgroundColor")
+ {
styleName = "backgroundColor";
+ if (value is String && value.charAt(0) != '#')
+ {
+ var c:uint = parseInt(value as String);
+ value = '#' + c.toString(16);
+ }
+ }
super.setStyle(styleName, value);
}
}