Repository: flex-sdk Updated Branches: refs/heads/develop 05ea4798b -> 3a087a60e
FLEX-34193 fixed selectedColor to actually contain the selected colour Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3a087a60 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3a087a60 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3a087a60 Branch: refs/heads/develop Commit: 3a087a60e1ad12c626da097bda8c25684d504e24 Parents: 05ea479 Author: Justin Mclean <[email protected]> Authored: Sun May 18 12:03:23 2014 -0700 Committer: Justin Mclean <[email protected]> Committed: Sun May 18 12:03:23 2014 -0700 ---------------------------------------------------------------------- .../projects/experimental/src/spark/components/ColorPicker.as | 2 ++ .../experimental/src/spark/skins/ColorPickerButtonSkin.mxml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3a087a60/frameworks/projects/experimental/src/spark/components/ColorPicker.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/experimental/src/spark/components/ColorPicker.as b/frameworks/projects/experimental/src/spark/components/ColorPicker.as index a340a10..bc3f590 100644 --- a/frameworks/projects/experimental/src/spark/components/ColorPicker.as +++ b/frameworks/projects/experimental/src/spark/components/ColorPicker.as @@ -151,6 +151,7 @@ package spark.components { solidColor.color = getColor(-1); if(noColorOrnament) noColorOrnament.visible = true; + selectedColor = getColor(-1); dispatchEvent(new ColorChangeEvent(ColorChangeEvent.NO_COLOR,0)); return; } @@ -160,6 +161,7 @@ package spark.components { if(noColorOrnament) noColorOrnament.visible = false; } + selectedColor = newColor; var ev:ColorChangeEvent = new ColorChangeEvent(ColorChangeEvent.CHOOSE, newColor); if(typeof(selectedItem) == "object"){ ev.colorObject = selectedItem; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3a087a60/frameworks/projects/experimental/src/spark/skins/ColorPickerButtonSkin.mxml ---------------------------------------------------------------------- diff --git a/frameworks/projects/experimental/src/spark/skins/ColorPickerButtonSkin.mxml b/frameworks/projects/experimental/src/spark/skins/ColorPickerButtonSkin.mxml index 7651b4d..10dfc66 100644 --- a/frameworks/projects/experimental/src/spark/skins/ColorPickerButtonSkin.mxml +++ b/frameworks/projects/experimental/src/spark/skins/ColorPickerButtonSkin.mxml @@ -30,7 +30,7 @@ <fx:Script fb:purpose="styling"> /* Define the skin elements that should not be colorized. For dropDownList buttons, the graphics are colorized but the arrow is not. */ - static private const exclusions:Array = ["icon"]; + static private const exclusions:Array = []; /** * @private
