You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2019/05/15 07:45:43 UTC
[royale-asjs] branch develop updated: All color models should have
Number, so NaN is an option.
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
The following commit(s) were added to refs/heads/develop by this push:
new 2834ad5 All color models should have Number, so NaN is an option.
2834ad5 is described below
commit 2834ad59073a58c1f40d44e1eec778f8aa0117ff
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed May 15 10:45:01 2019 +0300
All color models should have Number, so NaN is an option.
---
.../apache/royale/html/beads/models/ColorSpectrumModel.as | 14 +++++++-------
.../org/apache/royale/html/supportClasses/ColorSpectrum.as | 6 +++---
.../royale/org/apache/royale/core/IColorSpectrumModel.as | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ColorSpectrumModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ColorSpectrumModel.as
index 259d697..c92e5c7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ColorSpectrumModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ColorSpectrumModel.as
@@ -36,9 +36,9 @@ package org.apache.royale.html.beads.models
*/
public class ColorSpectrumModel extends EventDispatcher implements IColorSpectrumModel
{
- private var _color:uint;
- private var _baseColor:uint;
- private var _hsvModifiedColor:uint;
+ private var _color:Number;
+ private var _baseColor:Number;
+ private var _hsvModifiedColor:Number;
/**
* Constructor.
*
@@ -63,7 +63,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function get baseColor():uint
+ public function get baseColor():Number
{
return _baseColor;
}
@@ -71,7 +71,7 @@ package org.apache.royale.html.beads.models
/**
* @private
*/
- public function set baseColor(value:uint):void
+ public function set baseColor(value:Number):void
{
_baseColor = value;
dispatchEvent(new Event("baseColorChange"));
@@ -84,7 +84,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function get hsvModifiedColor():uint
+ public function get hsvModifiedColor():Number
{
return _hsvModifiedColor;
}
@@ -92,7 +92,7 @@ package org.apache.royale.html.beads.models
/**
* @private
*/
- public function set hsvModifiedColor(value:uint):void
+ public function set hsvModifiedColor(value:Number):void
{
_hsvModifiedColor = value;
dispatchEvent(new Event("hsvModifiedColorChange"));
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorSpectrum.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorSpectrum.as
index 72a158d..17e8dd1 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorSpectrum.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorSpectrum.as
@@ -65,7 +65,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function get baseColor():uint
+ public function get baseColor():Number
{
return IColorSpectrumModel(model).baseColor;
}
@@ -77,7 +77,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function set baseColor(value:uint):void
+ public function set baseColor(value:Number):void
{
IColorSpectrumModel(model).baseColor = value;
}
@@ -90,7 +90,7 @@ package org.apache.royale.html.supportClasses
* @productversion Royale 0.9.6
*/
[Bindable(event="change")]
- public function get hsvModifiedColor():uint
+ public function get hsvModifiedColor():Number
{
return IColorSpectrumModel(model).hsvModifiedColor;
}
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IColorSpectrumModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IColorSpectrumModel.as
index 60bd368..3e46c11 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IColorSpectrumModel.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IColorSpectrumModel.as
@@ -37,8 +37,8 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- function get baseColor():uint;
- function set baseColor(value:uint):void;
+ function get baseColor():Number;
+ function set baseColor(value:Number):void;
/**
* The resultant color after hue and saturation were modified
@@ -48,7 +48,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- function get hsvModifiedColor():uint;
- function set hsvModifiedColor(value:uint):void;
+ function get hsvModifiedColor():Number;
+ function set hsvModifiedColor(value:Number):void;
}
}