You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ak...@apache.org on 2015/01/07 09:58:03 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - Fixes a bug on
FlatSpark Button and ButtonIcon skins when borderRadius is changed
Repository: flex-sdk
Updated Branches:
refs/heads/develop 6dadf6ddf -> 395116b73
Fixes a bug on FlatSpark Button and ButtonIcon skins when borderRadius is changed
Removed Up, Over, Down and Disabled states in favor of just using color.[state]
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3b67d095
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3b67d095
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3b67d095
Branch: refs/heads/develop
Commit: 3b67d09565a00d258d79a4c24c800da089f461fe
Parents: 6dadf6d
Author: Mahmoud Ali <ak...@apache.org>
Authored: Wed Jan 7 05:55:16 2015 -0300
Committer: Mahmoud Ali <ak...@apache.org>
Committed: Wed Jan 7 05:55:16 2015 -0300
----------------------------------------------------------------------
.../src/flatspark/skins/ButtonIconSkin.mxml | 31 ++++--------------
.../src/flatspark/skins/ButtonSkin.mxml | 33 +++++---------------
2 files changed, 13 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3b67d095/frameworks/projects/flatspark/src/flatspark/skins/ButtonIconSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/flatspark/src/flatspark/skins/ButtonIconSkin.mxml b/frameworks/projects/flatspark/src/flatspark/skins/ButtonIconSkin.mxml
index 6965f79..f4a71fa 100644
--- a/frameworks/projects/flatspark/src/flatspark/skins/ButtonIconSkin.mxml
+++ b/frameworks/projects/flatspark/src/flatspark/skins/ButtonIconSkin.mxml
@@ -75,10 +75,7 @@ limitations under the License.
if (cornerRadius != cr)
{
cornerRadius = cr;
- fill_up.radiusX = cornerRadius;
- fill_over.radiusX = cornerRadius;
- fill_down.radiusX = cornerRadius;
- fill_disabled.radiusX = cornerRadius;
+ fill.radiusX = cornerRadius;
}
super.updateDisplayList(unscaledWidth, unscaledHeight);
@@ -165,31 +162,15 @@ limitations under the License.
<!-- layer 2: fill -->
<!--- @private -->
- <s:Rect id="fill_up" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="up">
+ <s:Rect id="fill" left="1" right="1" top="1" bottom="1" radiusX="6">
<s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(hostComponent.brand,stateUp)}"/>
+ <s:SolidColor color.up="{ColorUtils.ButtonColor(hostComponent.brand,stateUp)}"
+ color.over="{ColorUtils.ButtonColor(hostComponent.brand,stateOver)}"
+ color.down="{ColorUtils.ButtonColor(hostComponent.brand,stateDown)}"
+ color.disabled="{ColorUtils.ButtonColor(hostComponent.brand,stateDisabled)}"/>
</s:fill>
</s:Rect>
- <s:Rect id="fill_over" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="over">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(hostComponent.brand,stateOver)}"/>
- </s:fill>
- </s:Rect>
-
- <s:Rect id="fill_down" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="down">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(hostComponent.brand,stateDown)}"/>
- </s:fill>
- </s:Rect>
-
- <s:Rect id="fill_disabled" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="disabled">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(hostComponent.brand,stateDisabled)}"/>
- </s:fill>
- </s:Rect>
-
-
<!-- layer 8: text -->
<!--- @copy spark.components.supportClasses.ButtonBase#labelDisplay -->
<s:HGroup verticalAlign="middle" verticalCenter="0" horizontalAlign="center" horizontalCenter="0" left="10" right="10" top="2" bottom="2">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3b67d095/frameworks/projects/flatspark/src/flatspark/skins/ButtonSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/flatspark/src/flatspark/skins/ButtonSkin.mxml b/frameworks/projects/flatspark/src/flatspark/skins/ButtonSkin.mxml
index 966497f..fc12a06 100644
--- a/frameworks/projects/flatspark/src/flatspark/skins/ButtonSkin.mxml
+++ b/frameworks/projects/flatspark/src/flatspark/skins/ButtonSkin.mxml
@@ -75,10 +75,7 @@ limitations under the License.
if (cornerRadius != cr)
{
cornerRadius = cr;
- fill_up.radiusX = cornerRadius;
- fill_over.radiusX = cornerRadius;
- fill_down.radiusX = cornerRadius;
- fill_disabled.radiusX = cornerRadius;
+ fill.radiusX = cornerRadius;
}
super.updateDisplayList(unscaledWidth, unscaledHeight);
@@ -126,31 +123,15 @@ limitations under the License.
<!-- layer 2: fill -->
<!--- @private -->
- <s:Rect id="fill_up" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="up">
+ <s:Rect id="fill" left="1" right="1" top="1" bottom="1" radiusX="6">
<s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateUp)}"/>
+ <s:SolidColor color.up="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateUp)}"
+ color.over="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateOver)}"
+ color.down="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateDown)}"
+ color.disabled="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateDisabled)}"/>
</s:fill>
</s:Rect>
-
- <s:Rect id="fill_over" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="over">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateOver)}"/>
- </s:fill>
- </s:Rect>
-
- <s:Rect id="fill_down" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="down">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateDown)}"/>
- </s:fill>
- </s:Rect>
-
- <s:Rect id="fill_disabled" left="1" right="1" top="1" bottom="1" radiusX="6" includeIn="disabled">
- <s:fill>
- <s:SolidColor color="{ColorUtils.ButtonColor(BrandColorEnum.Default,stateDisabled)}"/>
- </s:fill>
- </s:Rect>
-
-
+
<!-- layer 8: text -->
<!--- @copy spark.components.supportClasses.ButtonBase#labelDisplay -->
<!--- @see initializationComplete() -->
[2/2] git commit: [flex-sdk] [refs/heads/develop] - FlatSpark: Fixes
an error when applying chromeColor, FLEX-34696
Posted by ak...@apache.org.
FlatSpark: Fixes an error when applying chromeColor, FLEX-34696
Removes 'border_disabled' from exclusions components
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/395116b7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/395116b7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/395116b7
Branch: refs/heads/develop
Commit: 395116b73694c196e71c12644db45a715fd69a93
Parents: 3b67d09
Author: Mahmoud Ali <ak...@apache.org>
Authored: Wed Jan 7 05:57:48 2015 -0300
Committer: Mahmoud Ali <ak...@apache.org>
Committed: Wed Jan 7 05:57:48 2015 -0300
----------------------------------------------------------------------
.../projects/flatspark/src/flatspark/skins/TextInputSkin.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/395116b7/frameworks/projects/flatspark/src/flatspark/skins/TextInputSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/flatspark/src/flatspark/skins/TextInputSkin.mxml b/frameworks/projects/flatspark/src/flatspark/skins/TextInputSkin.mxml
index 54f71f0..caf35d7 100644
--- a/frameworks/projects/flatspark/src/flatspark/skins/TextInputSkin.mxml
+++ b/frameworks/projects/flatspark/src/flatspark/skins/TextInputSkin.mxml
@@ -66,7 +66,7 @@ limitations under the License.
private var paddingChanged:Boolean;
/* Define the skin elements that should not be colorized. */
- static private const exclusions:Array = ["background", "background_disabled", "textDisplay", "promptDisplay", "border", "border_disabled"];
+ static private const exclusions:Array = ["background", "background_disabled", "textDisplay", "promptDisplay", "border"];
/* exclusions before Flex 4.5 for backwards-compatibility purposes */
static private const exclusions_4_0:Array = ["background", "background_disabled", "textDisplay", "promptDisplay"];