You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2015/02/02 10:02:57 UTC
[21/50] [abbrv] git commit: [flex-sdk] [refs/heads/master] - add
another style to control whether accentColor is used in Spinners
add another style to control whether accentColor is used in Spinners
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ef0b5b59
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ef0b5b59
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ef0b5b59
Branch: refs/heads/master
Commit: ef0b5b59db939d8a7c7f584d64db2eee588a54d2
Parents: 4e974b8
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 14 12:53:31 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 14 12:53:31 2015 -0800
----------------------------------------------------------------------
.../mobilecomponents/src/spark/components/SpinnerList.as | 1 -
.../src/spark/components/SpinnerListItemRenderer.as | 5 ++++-
frameworks/projects/mobiletheme/defaults.css | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef0b5b59/frameworks/projects/mobilecomponents/src/spark/components/SpinnerList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerList.as b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerList.as
index cffc008..76889de 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerList.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerList.as
@@ -41,7 +41,6 @@ import spark.layouts.supportClasses.LayoutBase;
use namespace mx_internal;
-[Exclude(name="accentColor", kind="style")]
[Exclude(name="chromeColor", kind="style")]
[Exclude(name="layout", kind="property")]
[Exclude(name="requireSelection", kind="property")]
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef0b5b59/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
index 6a5c643..80711a8 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
@@ -107,7 +107,10 @@ public class SpinnerListItemRenderer extends LabelItemRenderer
{
if(selected)
{
- _colorName = "accentColor"; // highlighted item
+ if (getStyle("useAccentColor"))
+ _colorName = "accentColor"; // highlighted item
+ else
+ _colorName = "color";
}else{
_colorName = "color"; // reset to use standard color
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef0b5b59/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index f063d8a..c39de85 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -268,7 +268,7 @@ SkinnableTextBase:disabledWithPrompt
SpinnerList
{
skinClass: ClassReference("spark.skins.mobile.SpinnerListSkin");
- accentColor: #000000;
+ useAccentColor: false;
}
SpinnerListContainer
@@ -1104,6 +1104,7 @@ global
skinClass: ClassReference("spark.skins.ios7.SpinnerListSkin");
color: #999999;
accentColor: #333333;
+ useAccentColor: true;
}
SpinnerListContainer