You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/11/06 02:54:15 UTC
[1/2] git commit: [flex-sdk] [refs/heads/iso7skins] - Fix for
https://issues.apache.org/jira/browse/FLEX-34633
Repository: flex-sdk
Updated Branches:
refs/heads/iso7skins 7b912c681 -> 93af62c7a
Fix for https://issues.apache.org/jira/browse/FLEX-34633
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ffd85a5c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ffd85a5c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ffd85a5c
Branch: refs/heads/iso7skins
Commit: ffd85a5c68e0f3edcc39246a6acb806c58304838
Parents: 7b912c6
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Nov 5 17:39:59 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Wed Nov 5 17:39:59 2014 -0800
----------------------------------------------------------------------
.../mobiletheme/src/spark/skins/android4/HSliderSkin.as | 7 +++++++
.../projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ffd85a5c/frameworks/projects/mobiletheme/src/spark/skins/android4/HSliderSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/android4/HSliderSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/android4/HSliderSkin.as
index 6f970f8..c9f696b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/android4/HSliderSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/android4/HSliderSkin.as
@@ -25,6 +25,7 @@ package spark.skins.android4
import mx.core.ClassFactory;
import mx.core.IFactory;
+ import mx.events.FlexEvent;
import spark.components.Button;
import spark.components.HSlider;
@@ -100,10 +101,16 @@ package spark.skins.android4
public function set hostComponent(value:HSlider):void
{
if (_hostComponent)
+ {
_hostComponent.removeEventListener(Event.CHANGE, thumbPositionChanged_handler);
+ _hostComponent.removeEventListener(FlexEvent.VALUE_COMMIT, thumbPositionChanged_handler);
+ }
_hostComponent = value;
if (_hostComponent)
+ {
_hostComponent.addEventListener(Event.CHANGE, thumbPositionChanged_handler);
+ _hostComponent.addEventListener(FlexEvent.VALUE_COMMIT, thumbPositionChanged_handler);
+ }
}
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ffd85a5c/frameworks/projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as
index 762ea64..db59b7f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/HSliderSkin.as
@@ -25,6 +25,7 @@ package spark.skins.ios7
import mx.core.ClassFactory;
import mx.core.IFactory;
+ import mx.events.FlexEvent;
import spark.components.Button;
import spark.components.HSlider;
@@ -100,10 +101,16 @@ package spark.skins.ios7
public function set hostComponent(value:HSlider):void
{
if (_hostComponent)
+ {
_hostComponent.removeEventListener(Event.CHANGE, thumbPositionChanged_handler);
+ _hostComponent.removeEventListener(FlexEvent.VALUE_COMMIT, thumbPositionChanged_handler);
+ }
_hostComponent = value;
if (_hostComponent)
+ {
_hostComponent.addEventListener(Event.CHANGE, thumbPositionChanged_handler);
+ _hostComponent.addEventListener(FlexEvent.VALUE_COMMIT, thumbPositionChanged_handler);
+ }
}
//--------------------------------------------------------------------------
[2/2] git commit: [flex-sdk] [refs/heads/iso7skins] - HScrollBar and
VScrollBar skins for iOS7. Includes a bug fix for the Android4 versions as
well.
Posted by bi...@apache.org.
HScrollBar and VScrollBar skins for iOS7. Includes a bug fix for the Android4 versions as well.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/93af62c7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/93af62c7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/93af62c7
Branch: refs/heads/iso7skins
Commit: 93af62c7ad72e6989039f4a898a704375bd3ea45
Parents: ffd85a5
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Nov 5 17:48:03 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Wed Nov 5 17:48:03 2014 -0800
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 8 ++++----
.../src/spark/skins/android4/HScrollBarThumbSkin.as | 2 +-
.../src/spark/skins/android4/VScrollBarThumbSkin.as | 2 +-
.../src/spark/skins/ios7/HScrollBarThumbSkin.as | 12 ++++++++++++
.../src/spark/skins/ios7/VScrollBarThumbSkin.as | 10 +++++++++-
5 files changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/93af62c7/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index b65e915..13c1d2a 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -1075,7 +1075,7 @@ global
HScrollBar
{
skinClass: ClassReference("spark.skins.ios7.HScrollBarSkin");
- thumbColor: #333333;
+ color: #E6E6E6;
}
HSlider
@@ -1162,7 +1162,7 @@ global
VScrollBar
{
skinClass: ClassReference("spark.skins.ios7.VScrollBarSkin");
- thumbColor: #333333;
+ color: #E6E6E6;
}
ViewMenu
@@ -1526,7 +1526,7 @@ application-dpi=240.
HScrollBar
{
skinClass: ClassReference("spark.skins.android4.HScrollBarSkin");
- thumbColor: #333333;
+ color: #333333;
}
HSlider
@@ -1612,7 +1612,7 @@ application-dpi=240.
VScrollBar
{
skinClass: ClassReference("spark.skins.android4.VScrollBarSkin");
- thumbColor: #333333;
+ color: #333333;
}
ViewMenu
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/93af62c7/frameworks/projects/mobiletheme/src/spark/skins/android4/HScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/android4/HScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/android4/HScrollBarThumbSkin.as
index 75a219a..a96e4e4 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/android4/HScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/android4/HScrollBarThumbSkin.as
@@ -168,7 +168,7 @@ public class HScrollBarThumbSkin extends MobileSkin
var thumbHeight:Number = unscaledHeight - paddingBottom;
- graphics.beginFill(getStyle("thumbColor"), 1);
+ graphics.beginFill(getStyle("color"), 1);
graphics.drawRect(paddingHorizontal + .5, 0.5, unscaledWidth - 2 * paddingHorizontal, thumbHeight);
graphics.endFill();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/93af62c7/frameworks/projects/mobiletheme/src/spark/skins/android4/VScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/android4/VScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/android4/VScrollBarThumbSkin.as
index dc22582..07fb0d1 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/android4/VScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/android4/VScrollBarThumbSkin.as
@@ -170,7 +170,7 @@ public class VScrollBarThumbSkin extends MobileSkin
var thumbWidth:Number = unscaledWidth - paddingRight;
- graphics.beginFill(getStyle("thumbColor"), 1);
+ graphics.beginFill(getStyle("color"), 1);
graphics.drawRect(0.5, paddingVertical + 0.5,thumbWidth, unscaledHeight - 2 * paddingVertical);
graphics.endFill();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/93af62c7/frameworks/projects/mobiletheme/src/spark/skins/ios7/HScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/HScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/HScrollBarThumbSkin.as
index f238a4c..90d758f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/HScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/HScrollBarThumbSkin.as
@@ -82,6 +82,12 @@ public class HScrollBarThumbSkin extends MobileSkin
// Depending on density set padding
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ paddingBottom = PADDING_BOTTOM_640DPI;
+ paddingHorizontal = PADDING_HORIZONTAL_640DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
paddingBottom = PADDING_BOTTOM_480DPI;
@@ -100,6 +106,12 @@ public class HScrollBarThumbSkin extends MobileSkin
paddingHorizontal = PADDING_HORIZONTAL_240DPI;
break;
}
+ case DPIClassification.DPI_120:
+ {
+ paddingBottom = PADDING_BOTTOM_120DPI;
+ paddingHorizontal = PADDING_HORIZONTAL_120DPI;
+ break;
+ }
default:
{
paddingBottom = PADDING_BOTTOM_DEFAULTDPI;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/93af62c7/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarThumbSkin.as
index 8d87c76..96b74e3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarThumbSkin.as
@@ -108,6 +108,12 @@ public class VScrollBarThumbSkin extends MobileSkin
paddingVertical = PADDING_VERTICAL_240DPI;
break;
}
+ case DPIClassification.DPI_120:
+ {
+ paddingRight = PADDING_RIGHT_120DPI;
+ paddingVertical = PADDING_VERTICAL_120DPI;
+ break;
+ }
default:
{
paddingRight = PADDING_RIGHT_DEFAULTDPI;
@@ -168,7 +174,9 @@ public class VScrollBarThumbSkin extends MobileSkin
var thumbWidth:Number = unscaledWidth - paddingRight;
- graphics.beginFill(getStyle("thumbColor"), 1);
+ var thumbColor:uint = getStyle("color");
+
+ graphics.beginFill(thumbColor, 1);
graphics.drawRect(0.5, paddingVertical + 0.5,thumbWidth, unscaledHeight - 2 * paddingVertical);
graphics.endFill();