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/19 02:31:34 UTC
[1/3] git commit: [flex-sdk] [refs/heads/iso7skins] - iOS7+ skins for
StateTextArea, StageTextInput, TextArea and TextInput.
Repository: flex-sdk
Updated Branches:
refs/heads/iso7skins ebe4b4f98 -> 404f5b57a
iOS7+ skins for StateTextArea, StageTextInput, TextArea and TextInput.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ef507a46
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ef507a46
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ef507a46
Branch: refs/heads/iso7skins
Commit: ef507a4631d1a80413d6618353c9c15cec62491a
Parents: ebe4b4f
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Nov 18 17:21:03 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Tue Nov 18 17:21:03 2014 -0800
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 19 +++---
.../src/spark/skins/ios7/StageTextInputSkin.as | 1 -
.../src/spark/skins/ios7/TextAreaSkin.as | 61 ++++++++++----------
.../src/spark/skins/ios7/TextInputSkin.as | 61 ++++++++++----------
.../ios7/supportClasses/StageTextSkinBase.as | 60 ++++++++++---------
5 files changed, 99 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index aceaa51..c5f34de 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -1093,7 +1093,6 @@ global
SpinnerList
{
skinClass: ClassReference("spark.skins.ios7.SpinnerListSkin");
- fontSize: 10;
color: #999999;
accentColor: #333333;
}
@@ -1127,29 +1126,33 @@ global
}
TextInput
- {
+ {
skinClass: ClassReference("spark.skins.ios7.StageTextInputSkin");
- contentBackgroundAlpha: 0;
- focusColor: #33B5E5;
+ contentBackgroundAlpha: 0;
+ focusColor: #cccccc;
+ borderColor: #cccccc;
contentBackgroundColor: #DEDEDD;
- contentBackgroundBorder: "flat";
+ contentBackgroundBorder: "roundedrect";
fontFamily: RobotoRegular;
+ fontWeight: normal;
selectionHighlighting: "never";
focusEnabled:"false";
focusThickness: 0;
+ focusAlpha: 0;
}
TextArea
- {
+ {
skinClass: ClassReference("spark.skins.ios7.StageTextAreaSkin");
contentBackgroundAlpha: 1;
contentBackgroundBorder: "rectangle";
contentBackgroundColor: #DEDEDD;
- focusColor: #33B5E5;
- fontFamily: RobotoRegular;
+ focusColor: #cccccc;
+ borderColor: #cccccc;
selectionHighlighting: "never";
focusEnabled:"false";
focusThickness: 0;
+ focusAlpha: 0;
}
ToggleSwitch
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
index 388a599..6d6c811 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
@@ -129,6 +129,5 @@ package spark.skins.ios7
{
return new ScrollableStageText(multiline);
}
-
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
index 7f87388..5133ae8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
@@ -106,48 +106,48 @@ public class TextAreaSkin extends TextSkinBase
{
measuredDefaultWidth = 1024;
measuredDefaultHeight = 212;
- layoutBorderSize = 4;
- flatheight = 9;
+ layoutBorderSize = 3;
+ roundheight = 24;
break;
}
case DPIClassification.DPI_480:
{
measuredDefaultWidth = 880;
measuredDefaultHeight = 140;
- layoutBorderSize = 3;
- flatheight = 7;
+ layoutBorderSize = 2;
+ roundheight = 18;
break;
}
case DPIClassification.DPI_320:
{
measuredDefaultWidth = 612;
measuredDefaultHeight = 106;
- layoutBorderSize = 2;
- flatheight = 6;
+ layoutBorderSize = 1.5;
+ roundheight = 14;
break;
}
case DPIClassification.DPI_240:
{
measuredDefaultWidth = 440;
measuredDefaultHeight = 70;
- layoutBorderSize = 2;
- flatheight = 5;
+ layoutBorderSize = 1;
+ roundheight = 10;
break;
}
case DPIClassification.DPI_120:
{
measuredDefaultWidth = 220;
measuredDefaultHeight = 35;
- layoutBorderSize = 1;
- flatheight = 2;
+ layoutBorderSize = .5;
+ roundheight = 5;
break;
}
default:
{
measuredDefaultWidth = 306;
measuredDefaultHeight = 53;
- layoutBorderSize = 1;
- flatheight = 3;
+ layoutBorderSize = .5;
+ roundheight = 7;
break;
}
}
@@ -190,7 +190,7 @@ public class TextAreaSkin extends TextSkinBase
protected var isFocused:Boolean = false;
- protected var flatheight:uint;
+ protected var roundheight:uint;
/**
* @private
@@ -622,37 +622,35 @@ public class TextAreaSkin extends TextSkinBase
var contentBackgroundAlpha:Number = getStyle("contentBackgroundAlpha");
//change border color and thickness when in focus
var borderColor:uint = isFocused ? getStyle("focusColor") : getStyle("borderColor");
- var selectWidth:uint = isFocused ? layoutBorderSize + 1 : layoutBorderSize;
+ var borderWidth:uint = layoutBorderSize * 2;
if (isNaN(contentBackgroundAlpha))
{
contentBackgroundAlpha = 1;
}
- if (getStyle("contentBackgroundBorder") == "flat")
+ if (getStyle("contentBackgroundBorder") == "roundedrect")
{
- var halfGap:int = flatheight * 2;
- //background
+ graphics.lineStyle(layoutBorderSize, borderColor, 1, true);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
- graphics.drawRect(0, 0, unscaledWidth, unscaledHeight - flatheight);
- graphics.endFill();
- //begin flat border
- graphics.beginFill(borderColor, 1);
- //left half border
- graphics.drawRect(0, unscaledHeight - halfGap, selectWidth, flatheight );
- //bottom border
- graphics.drawRect(0, unscaledHeight - flatheight, unscaledWidth, selectWidth);
- //right border
- graphics.drawRect(unscaledWidth - selectWidth, unscaledHeight - halfGap, selectWidth, flatheight);
+ graphics.drawRoundRectComplex(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth, roundheight, roundheight, roundheight, roundheight);
graphics.endFill();
}
- else if (getStyle("contentBackgroundBorder") == "rectangle")
+ if (getStyle("contentBackgroundBorder") == "rectangle")
{
- var borderWidth:uint = layoutBorderSize * 2;
+
//rectangle border and background
- graphics.lineStyle(selectWidth, borderColor, 1);
+ graphics.lineStyle(layoutBorderSize, borderColor, 1);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
graphics.drawRect(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
graphics.endFill();
}
+ else if (getStyle("contentBackgroundBorder") == "none")
+ {
+
+ //rectangle border and background
+ graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
+ graphics.drawRect(0, 0, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
+ graphics.endFill();
+ }
}
/**
@@ -663,8 +661,7 @@ public class TextAreaSkin extends TextSkinBase
{
var maxHsp:Number = textDisplayGroup.contentWidth > textDisplayGroup.width ?
textDisplayGroup.contentWidth-textDisplayGroup.width : 0;
- textDisplayGroup.horizontalScrollPosition =
- Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
+ textDisplayGroup.horizontalScrollPosition = Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
var maxVsp:Number = textDisplayGroup.contentHeight > textDisplayGroup.height ?
textDisplayGroup.contentHeight-textDisplayGroup.height : 0;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
index 3533aa1..f2b243e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
@@ -22,6 +22,7 @@ package spark.skins.ios7
import flash.events.Event;
import flash.events.FocusEvent;
import flash.events.SoftKeyboardEvent;
+ import flash.system.Capabilities;
import mx.core.DPIClassification;
import mx.core.EventPriority;
@@ -45,7 +46,7 @@ package spark.skins.ios7
* @playerversion AIR 2.5
* @productversion Flex 4.5
*/
- public class TextInputSkin extends TextSkinBase
+ public class TextInputSkin extends TextSkinBase
{
//--------------------------------------------------------------------------
//
@@ -74,8 +75,8 @@ package spark.skins.ios7
{
measuredDefaultWidth = 1200;
measuredDefaultHeight = 132;
- layoutBorderSize = 4;
- flatheight = 9;
+ layoutBorderSize = 3;
+ roundheight = 24;
break;
}
case DPIClassification.DPI_480:
@@ -83,40 +84,40 @@ package spark.skins.ios7
measuredDefaultWidth = 880;
measuredDefaultHeight = 100;
- layoutBorderSize = 3;
- flatheight = 7;
+ layoutBorderSize = 2;
+ roundheight = 18;
break;
}
case DPIClassification.DPI_320:
{
measuredDefaultWidth = 600;
measuredDefaultHeight = 66;
- layoutBorderSize = 2;
- flatheight = 6;
+ layoutBorderSize = 1.5;
+ roundheight = 14;
break;
}
case DPIClassification.DPI_240:
{
measuredDefaultWidth = 440;
measuredDefaultHeight = 50;
- layoutBorderSize = 2;
- flatheight = 5;
+ layoutBorderSize = 1;
+ roundheight = 10;
break;
}
case DPIClassification.DPI_120:
{
measuredDefaultWidth = 220;
measuredDefaultHeight = 25;
- layoutBorderSize = 1;
- flatheight = 2;
+ layoutBorderSize = .5;
+ roundheight = 5;
break;
}
default:
{
measuredDefaultWidth = 300;
measuredDefaultHeight = 33;
- layoutBorderSize = 1;
- flatheight = 3;
+ layoutBorderSize = .5;
+ roundheight = 7;
break;
}
}
@@ -132,7 +133,7 @@ package spark.skins.ios7
protected var isFocused:Boolean = false;
- protected var flatheight:uint;
+ protected var roundheight:uint;
/**
* @copy spark.skins.spark.ApplicationSkin#hostComponent
@@ -290,37 +291,35 @@ package spark.skins.ios7
var contentBackgroundAlpha:Number = getStyle("contentBackgroundAlpha");
//change border color and thickness when in focus
var borderColor:uint = isFocused ? getStyle("focusColor") : getStyle("borderColor");
- var selectWidth:uint = isFocused ? layoutBorderSize + 1 : layoutBorderSize;
+ var borderWidth:uint = layoutBorderSize * 2;
if (isNaN(contentBackgroundAlpha))
{
contentBackgroundAlpha = 1;
}
- if (getStyle("contentBackgroundBorder") == "flat")
+ if (getStyle("contentBackgroundBorder") == "roundedrect")
{
- var halfGap:int = flatheight * 2;
- //background
+ graphics.lineStyle(layoutBorderSize, borderColor, 1, true);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
- graphics.drawRect(0, 0, unscaledWidth, unscaledHeight - flatheight);
- graphics.endFill();
- //begin flat border
- graphics.beginFill(borderColor, 1);
- //left half border
- graphics.drawRect(0, unscaledHeight - halfGap, selectWidth, flatheight );
- //bottom border
- graphics.drawRect(0, unscaledHeight - flatheight, unscaledWidth, selectWidth);
- //right border
- graphics.drawRect(unscaledWidth - selectWidth, unscaledHeight - halfGap, selectWidth, flatheight);
+ graphics.drawRoundRectComplex(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth, roundheight, roundheight, roundheight, roundheight);
graphics.endFill();
}
- else if (getStyle("contentBackgroundBorder") == "rectangle")
+ if (getStyle("contentBackgroundBorder") == "rectangle")
{
- var borderWidth:uint = layoutBorderSize * 2;
+
//rectangle border and background
- graphics.lineStyle(selectWidth, borderColor, 1);
+ graphics.lineStyle(layoutBorderSize, borderColor, 1);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
graphics.drawRect(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
graphics.endFill();
}
+ else if (getStyle("contentBackgroundBorder") == "none")
+ {
+
+ //rectangle border and background
+ graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
+ graphics.drawRect(0, 0, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
+ graphics.endFill();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
index 10e0632..89b8b13 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
@@ -66,48 +66,48 @@ public class StageTextSkinBase extends MobileSkin
{
measuredDefaultWidth = 1200;
measuredDefaultHeight = 132;
- layoutBorderSize = 4;
- flatheight = 9;
+ layoutBorderSize = 3;
+ roundheight = 24;
break;
}
case DPIClassification.DPI_480:
{
measuredDefaultWidth = 880;
measuredDefaultHeight = 100;
- layoutBorderSize = 3;
- flatheight = 7;
+ layoutBorderSize = 2;
+ roundheight = 18;
break;
}
case DPIClassification.DPI_320:
{
measuredDefaultWidth = 600;
measuredDefaultHeight = 66;
- layoutBorderSize = 2;
- flatheight = 6;
+ layoutBorderSize = 1.5;
+ roundheight = 14;
break;
}
case DPIClassification.DPI_240:
{
measuredDefaultWidth = 440;
measuredDefaultHeight = 50;
- layoutBorderSize = 2;
- flatheight = 5;
+ layoutBorderSize = 1;
+ roundheight = 10;
break;
}
case DPIClassification.DPI_120:
{
measuredDefaultWidth = 220;
measuredDefaultHeight = 25;
- layoutBorderSize = 1;
- flatheight = 2;
+ layoutBorderSize = .5;
+ roundheight = 5;
break;
}
default:
{
measuredDefaultWidth = 300;
measuredDefaultHeight = 33;
- layoutBorderSize = 1;
- flatheight = 3;
+ layoutBorderSize = .5;
+ roundheight = 7;
break;
}
@@ -138,7 +138,7 @@ public class StageTextSkinBase extends MobileSkin
*/
protected var layoutBorderSize:uint;
- protected var flatheight:uint;
+ protected var roundheight:uint;
//--------------------------------------------------------------------------
//
@@ -216,7 +216,7 @@ public class StageTextSkinBase extends MobileSkin
*
* @return instance of IStyleableEditableText
*/
- protected function createTextDisplay():IStyleableEditableText
+ protected function createTextDisplay():IStyleableEditableText
{
return new StyleableStageText(multiline);
}
@@ -232,38 +232,36 @@ public class StageTextSkinBase extends MobileSkin
var contentBackgroundAlpha:Number = getStyle("contentBackgroundAlpha");
//change border color and thickness when in focus
var borderColor:uint = isFocused ? getStyle("focusColor") : getStyle("borderColor");
- var selectWidth:uint = isFocused ? layoutBorderSize + 1 : layoutBorderSize;
+ var borderWidth:uint = layoutBorderSize * 2;
if (isNaN(contentBackgroundAlpha))
{
contentBackgroundAlpha = 1;
}
- var halfGap:int = flatheight * 2;
// change the border type
- if (getStyle("contentBackgroundBorder") == "flat")
+ if (getStyle("contentBackgroundBorder") == "roundedrect")
{
- //background
+ graphics.lineStyle(layoutBorderSize, borderColor, 1, true);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
- graphics.drawRect(0, 0, unscaledWidth, unscaledHeight - flatheight);
- graphics.endFill();
- //begin flat border
- graphics.beginFill(borderColor, 1);
- //left half border
- graphics.drawRect(0, unscaledHeight - halfGap, selectWidth, flatheight );
- //bottom border
- graphics.drawRect(0, unscaledHeight - flatheight, unscaledWidth, selectWidth);
- //right border
- graphics.drawRect(unscaledWidth - selectWidth, unscaledHeight - halfGap, selectWidth, flatheight);
+ graphics.drawRoundRectComplex(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth, roundheight, roundheight, roundheight, roundheight);
graphics.endFill();
}
- else if (getStyle("contentBackgroundBorder") == "rectangle")
+ if (getStyle("contentBackgroundBorder") == "rectangle")
{
- var borderWidth:uint = layoutBorderSize * 2;
+
//rectangle border and background
- graphics.lineStyle(selectWidth, borderColor, 1);
+ graphics.lineStyle(layoutBorderSize, borderColor, 1);
graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
graphics.drawRect(layoutBorderSize, layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
graphics.endFill();
}
+ else if (getStyle("contentBackgroundBorder") == "none")
+ {
+
+ //rectangle border and background
+ graphics.beginFill(contentBackgroundColor, contentBackgroundAlpha);
+ graphics.drawRect(0, 0, unscaledWidth - borderWidth, unscaledHeight - borderWidth);
+ graphics.endFill();
+ }
}
/**
Re: [1/3] git commit: [flex-sdk] [refs/heads/iso7skins] - iOS7+ skins
for StateTextArea, StageTextInput, TextArea and TextInput.
Posted by OmPrakash Muppirala <bi...@gmail.com>.
I forgot to mention in my commit comment that the Text related skins were
donated by Aaron Nash (quick6black)
Thanks,
Om
On Tue, Nov 18, 2014 at 5:31 PM, <bi...@apache.org> wrote:
> Repository: flex-sdk
> Updated Branches:
> refs/heads/iso7skins ebe4b4f98 -> 404f5b57a
>
>
> iOS7+ skins for StateTextArea, StageTextInput, TextArea and TextInput.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ef507a46
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ef507a46
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ef507a46
>
> Branch: refs/heads/iso7skins
> Commit: ef507a4631d1a80413d6618353c9c15cec62491a
> Parents: ebe4b4f
> Author: OmPrakash Muppirala <bi...@gmail.com>
> Authored: Tue Nov 18 17:21:03 2014 -0800
> Committer: OmPrakash Muppirala <bi...@gmail.com>
> Committed: Tue Nov 18 17:21:03 2014 -0800
>
> ----------------------------------------------------------------------
> frameworks/projects/mobiletheme/defaults.css | 19 +++---
> .../src/spark/skins/ios7/StageTextInputSkin.as | 1 -
> .../src/spark/skins/ios7/TextAreaSkin.as | 61 ++++++++++----------
> .../src/spark/skins/ios7/TextInputSkin.as | 61 ++++++++++----------
> .../ios7/supportClasses/StageTextSkinBase.as | 60 ++++++++++---------
> 5 files changed, 99 insertions(+), 103 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/defaults.css
> ----------------------------------------------------------------------
> diff --git a/frameworks/projects/mobiletheme/defaults.css
> b/frameworks/projects/mobiletheme/defaults.css
> index aceaa51..c5f34de 100644
> --- a/frameworks/projects/mobiletheme/defaults.css
> +++ b/frameworks/projects/mobiletheme/defaults.css
> @@ -1093,7 +1093,6 @@ global
> SpinnerList
> {
> skinClass:
> ClassReference("spark.skins.ios7.SpinnerListSkin");
> - fontSize: 10;
> color: #999999;
> accentColor: #333333;
> }
> @@ -1127,29 +1126,33 @@ global
> }
>
> TextInput
> - {
> + {
> skinClass:
> ClassReference("spark.skins.ios7.StageTextInputSkin");
> - contentBackgroundAlpha: 0;
> - focusColor: #33B5E5;
> + contentBackgroundAlpha: 0;
> + focusColor: #cccccc;
> + borderColor: #cccccc;
> contentBackgroundColor: #DEDEDD;
> - contentBackgroundBorder: "flat";
> + contentBackgroundBorder: "roundedrect";
> fontFamily: RobotoRegular;
> + fontWeight: normal;
> selectionHighlighting: "never";
> focusEnabled:"false";
> focusThickness: 0;
> + focusAlpha: 0;
> }
>
> TextArea
> - {
> + {
> skinClass:
> ClassReference("spark.skins.ios7.StageTextAreaSkin");
> contentBackgroundAlpha: 1;
> contentBackgroundBorder: "rectangle";
> contentBackgroundColor: #DEDEDD;
> - focusColor: #33B5E5;
> - fontFamily: RobotoRegular;
> + focusColor: #cccccc;
> + borderColor: #cccccc;
> selectionHighlighting: "never";
> focusEnabled:"false";
> focusThickness: 0;
> + focusAlpha: 0;
> }
>
> ToggleSwitch
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> index 388a599..6d6c811 100644
> ---
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> +++
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> @@ -129,6 +129,5 @@ package spark.skins.ios7
> {
> return new ScrollableStageText(multiline);
> }
> -
> }
> }
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> index 7f87388..5133ae8 100644
> --- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> +++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> @@ -106,48 +106,48 @@ public class TextAreaSkin extends TextSkinBase
> {
> measuredDefaultWidth = 1024;
> measuredDefaultHeight = 212;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> {
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 140;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 612;
> measuredDefaultHeight = 106;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 70;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 35;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 306;
> measuredDefaultHeight = 53;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
> }
> @@ -190,7 +190,7 @@ public class TextAreaSkin extends TextSkinBase
>
> protected var isFocused:Boolean = false;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
> /**
> * @private
> @@ -622,37 +622,35 @@ public class TextAreaSkin extends TextSkinBase
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ? getStyle("focusColor")
> : getStyle("borderColor");
> - var selectWidth:uint = isFocused ? layoutBorderSize + 1 :
> layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") == "roundedrect")
> {
> - var halfGap:int = flatheight * 2;
> - //background
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight - halfGap,
> selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight - flatheight,
> unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth - selectWidth,
> unscaledHeight - halfGap, selectWidth, flatheight);
> + graphics.drawRoundRectComplex(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth, roundheight, roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") == "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize * 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth, borderColor, 1);
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") == "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
> @@ -663,8 +661,7 @@ public class TextAreaSkin extends TextSkinBase
> {
> var maxHsp:Number = textDisplayGroup.contentWidth >
> textDisplayGroup.width ?
> textDisplayGroup.contentWidth-textDisplayGroup.width : 0;
> - textDisplayGroup.horizontalScrollPosition =
> -
> Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
> + textDisplayGroup.horizontalScrollPosition =
> Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
>
> var maxVsp:Number = textDisplayGroup.contentHeight >
> textDisplayGroup.height ?
> textDisplayGroup.contentHeight-textDisplayGroup.height : 0;
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> index 3533aa1..f2b243e 100644
> --- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> +++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> @@ -22,6 +22,7 @@ package spark.skins.ios7
> import flash.events.Event;
> import flash.events.FocusEvent;
> import flash.events.SoftKeyboardEvent;
> + import flash.system.Capabilities;
>
> import mx.core.DPIClassification;
> import mx.core.EventPriority;
> @@ -45,7 +46,7 @@ package spark.skins.ios7
> * @playerversion AIR 2.5
> * @productversion Flex 4.5
> */
> - public class TextInputSkin extends TextSkinBase
> + public class TextInputSkin extends TextSkinBase
> {
>
> //--------------------------------------------------------------------------
> //
> @@ -74,8 +75,8 @@ package spark.skins.ios7
> {
> measuredDefaultWidth = 1200;
> measuredDefaultHeight = 132;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> @@ -83,40 +84,40 @@ package spark.skins.ios7
>
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 100;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 600;
> measuredDefaultHeight = 66;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 50;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 25;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 300;
> measuredDefaultHeight = 33;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
> }
> @@ -132,7 +133,7 @@ package spark.skins.ios7
>
> protected var isFocused:Boolean = false;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
> /**
> * @copy spark.skins.spark.ApplicationSkin#hostComponent
> @@ -290,37 +291,35 @@ package spark.skins.ios7
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ?
> getStyle("focusColor") : getStyle("borderColor");
> - var selectWidth:uint = isFocused ?
> layoutBorderSize + 1 : layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") ==
> "roundedrect")
> {
> - var halfGap:int = flatheight * 2;
> - //background
> + graphics.lineStyle(layoutBorderSize,
> borderColor, 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight -
> halfGap, selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight -
> flatheight, unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth -
> selectWidth, unscaledHeight - halfGap, selectWidth, flatheight);
> +
> graphics.drawRoundRectComplex(layoutBorderSize, layoutBorderSize,
> unscaledWidth - borderWidth, unscaledHeight - borderWidth, roundheight,
> roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize *
> 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth,
> borderColor, 1);
> + graphics.lineStyle(layoutBorderSize,
> borderColor, 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") ==
> "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> index 10e0632..89b8b13 100644
> ---
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> +++
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> @@ -66,48 +66,48 @@ public class StageTextSkinBase extends MobileSkin
> {
> measuredDefaultWidth = 1200;
> measuredDefaultHeight = 132;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> {
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 100;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 600;
> measuredDefaultHeight = 66;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 50;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 25;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 300;
> measuredDefaultHeight = 33;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
>
> @@ -138,7 +138,7 @@ public class StageTextSkinBase extends MobileSkin
> */
> protected var layoutBorderSize:uint;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
>
> //--------------------------------------------------------------------------
> //
> @@ -216,7 +216,7 @@ public class StageTextSkinBase extends MobileSkin
> *
> * @return instance of IStyleableEditableText
> */
> - protected function createTextDisplay():IStyleableEditableText
> + protected function createTextDisplay():IStyleableEditableText
> {
> return new StyleableStageText(multiline);
> }
> @@ -232,38 +232,36 @@ public class StageTextSkinBase extends MobileSkin
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ? getStyle("focusColor")
> : getStyle("borderColor");
> - var selectWidth:uint = isFocused ? layoutBorderSize + 1 :
> layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - var halfGap:int = flatheight * 2;
> // change the border type
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") == "roundedrect")
> {
> - //background
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight - halfGap,
> selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight - flatheight,
> unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth - selectWidth,
> unscaledHeight - halfGap, selectWidth, flatheight);
> + graphics.drawRoundRectComplex(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth, roundheight, roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") == "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize * 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth, borderColor, 1);
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") == "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
>
>
[3/3] git commit: [flex-sdk] [refs/heads/iso7skins] - SpinnerList
skins now work fine in all DPIs
Posted by bi...@apache.org.
SpinnerList skins now work fine in all DPIs
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/404f5b57
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/404f5b57
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/404f5b57
Branch: refs/heads/iso7skins
Commit: 404f5b57a2d34261db41dd62be5aa4922aed313c
Parents: e3b1f20
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Nov 18 17:28:58 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Tue Nov 18 17:28:58 2014 -0800
----------------------------------------------------------------------
.../skins/ios7/SpinnerListContainerSkin.as | 36 +-------------------
.../src/spark/skins/ios7/SpinnerListSkin.as | 15 ++++----
.../SpinnerListContainerSelectionIndicator.fxg | 2 +-
3 files changed, 10 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/404f5b57/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListContainerSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListContainerSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListContainerSkin.as
index 0976e33..aa2b05b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListContainerSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListContainerSkin.as
@@ -66,40 +66,7 @@ package spark.skins.ios7
selectionIndicatorClass = spark.skins.ios7.assets.SpinnerListContainerSelectionIndicator;
cornerRadius = 0;
borderThickness = 0;
- switch (applicationDPI)
- {
- case DPIClassification.DPI_640:
- {
- selectionIndicatorHeight = 182;
- break;
- }
- case DPIClassification.DPI_480:
- {
- selectionIndicatorHeight = 144;
- break;
- }
- case DPIClassification.DPI_320:
- {
- selectionIndicatorHeight = 96;
- break;
- }
- selectionIndicatorHeight = 24;
- case DPIClassification.DPI_240:
- {
- selectionIndicatorHeight = 72;
- break;
- }
- case DPIClassification.DPI_120:
- {
- selectionIndicatorHeight = 36;
- break;
- }
- default: // default DPI_160
- {
-
- break;
- }
- }
+
minWidth = 30;
}
@@ -134,7 +101,6 @@ package spark.skins.ios7
* @playerversion AIR 3
* @productversion Flex 4.6
*/
- protected var selectionIndicatorHeight:Number;
/**
* Class for the border part.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/404f5b57/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListSkin.as
index 2cd27f5..57a90b8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/SpinnerListSkin.as
@@ -64,42 +64,42 @@ package spark.skins.ios7
{
case DPIClassification.DPI_640:
{
- selectionIndicatorHeight = 182;
+ selectionIndicatorHeight = 144;
minWidth = 64;
borderThickness = 3;
break;
}
case DPIClassification.DPI_480:
{
- selectionIndicatorHeight = 144;
+ selectionIndicatorHeight = 96;
minWidth = 48;
borderThickness = 2;
break;
}
case DPIClassification.DPI_320:
{
- selectionIndicatorHeight = 96;
+ selectionIndicatorHeight = 72;
minWidth = 32;
borderThickness = 2;
break;
}
case DPIClassification.DPI_240:
{
- selectionIndicatorHeight = 72;
+ selectionIndicatorHeight = 48;
minWidth = 24;
borderThickness = 1;
break;
}
case DPIClassification.DPI_120:
{
- selectionIndicatorHeight = 36;
+ selectionIndicatorHeight = 24;
minWidth = 12;
borderThickness = 0;
break;
}
default:
{
- selectionIndicatorHeight = 24;
+ selectionIndicatorHeight = 36;
minWidth = 16;
borderThickness = 1;
}
@@ -227,7 +227,8 @@ package spark.skins.ios7
// Create data group layout
var layout:VerticalSpinnerLayout = new VerticalSpinnerLayout();
layout.requestedRowCount = 9;
- layout.rowHeight = 20;
+ layout.rowHeight = selectionIndicatorHeight/1.5;
+ layout.gap = 0;
// Create data group
dataGroup = new DataGroup();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/404f5b57/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/SpinnerListContainerSelectionIndicator.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/SpinnerListContainerSelectionIndicator.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/SpinnerListContainerSelectionIndicator.fxg
index 5582812..c362560 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/SpinnerListContainerSelectionIndicator.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/SpinnerListContainerSelectionIndicator.fxg
@@ -22,7 +22,7 @@
-->
<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="24" viewWidth="100"
- scaleGridLeft="3" scaleGridTop="5.5" scaleGridRight="97" scaleGridBottom="18.5">
+ scaleGridLeft="3" scaleGridTop="3" scaleGridRight="97" scaleGridBottom="21">
<!-- Transparent rect used to center the bar -->
<Rect x="0" y="0" width="100" height="4">
<fill>
Re: [1/3] git commit: [flex-sdk] [refs/heads/iso7skins] - iOS7+ skins
for StateTextArea, StageTextInput, TextArea and TextInput.
Posted by OmPrakash Muppirala <bi...@gmail.com>.
I forgot to mention in my commit comment that the Text related skins were
donated by Aaron Nash (quick6black)
Thanks,
Om
On Tue, Nov 18, 2014 at 5:31 PM, <bi...@apache.org> wrote:
> Repository: flex-sdk
> Updated Branches:
> refs/heads/iso7skins ebe4b4f98 -> 404f5b57a
>
>
> iOS7+ skins for StateTextArea, StageTextInput, TextArea and TextInput.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ef507a46
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ef507a46
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ef507a46
>
> Branch: refs/heads/iso7skins
> Commit: ef507a4631d1a80413d6618353c9c15cec62491a
> Parents: ebe4b4f
> Author: OmPrakash Muppirala <bi...@gmail.com>
> Authored: Tue Nov 18 17:21:03 2014 -0800
> Committer: OmPrakash Muppirala <bi...@gmail.com>
> Committed: Tue Nov 18 17:21:03 2014 -0800
>
> ----------------------------------------------------------------------
> frameworks/projects/mobiletheme/defaults.css | 19 +++---
> .../src/spark/skins/ios7/StageTextInputSkin.as | 1 -
> .../src/spark/skins/ios7/TextAreaSkin.as | 61 ++++++++++----------
> .../src/spark/skins/ios7/TextInputSkin.as | 61 ++++++++++----------
> .../ios7/supportClasses/StageTextSkinBase.as | 60 ++++++++++---------
> 5 files changed, 99 insertions(+), 103 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/defaults.css
> ----------------------------------------------------------------------
> diff --git a/frameworks/projects/mobiletheme/defaults.css
> b/frameworks/projects/mobiletheme/defaults.css
> index aceaa51..c5f34de 100644
> --- a/frameworks/projects/mobiletheme/defaults.css
> +++ b/frameworks/projects/mobiletheme/defaults.css
> @@ -1093,7 +1093,6 @@ global
> SpinnerList
> {
> skinClass:
> ClassReference("spark.skins.ios7.SpinnerListSkin");
> - fontSize: 10;
> color: #999999;
> accentColor: #333333;
> }
> @@ -1127,29 +1126,33 @@ global
> }
>
> TextInput
> - {
> + {
> skinClass:
> ClassReference("spark.skins.ios7.StageTextInputSkin");
> - contentBackgroundAlpha: 0;
> - focusColor: #33B5E5;
> + contentBackgroundAlpha: 0;
> + focusColor: #cccccc;
> + borderColor: #cccccc;
> contentBackgroundColor: #DEDEDD;
> - contentBackgroundBorder: "flat";
> + contentBackgroundBorder: "roundedrect";
> fontFamily: RobotoRegular;
> + fontWeight: normal;
> selectionHighlighting: "never";
> focusEnabled:"false";
> focusThickness: 0;
> + focusAlpha: 0;
> }
>
> TextArea
> - {
> + {
> skinClass:
> ClassReference("spark.skins.ios7.StageTextAreaSkin");
> contentBackgroundAlpha: 1;
> contentBackgroundBorder: "rectangle";
> contentBackgroundColor: #DEDEDD;
> - focusColor: #33B5E5;
> - fontFamily: RobotoRegular;
> + focusColor: #cccccc;
> + borderColor: #cccccc;
> selectionHighlighting: "never";
> focusEnabled:"false";
> focusThickness: 0;
> + focusAlpha: 0;
> }
>
> ToggleSwitch
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> index 388a599..6d6c811 100644
> ---
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> +++
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/StageTextInputSkin.as
> @@ -129,6 +129,5 @@ package spark.skins.ios7
> {
> return new ScrollableStageText(multiline);
> }
> -
> }
> }
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> index 7f87388..5133ae8 100644
> --- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> +++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextAreaSkin.as
> @@ -106,48 +106,48 @@ public class TextAreaSkin extends TextSkinBase
> {
> measuredDefaultWidth = 1024;
> measuredDefaultHeight = 212;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> {
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 140;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 612;
> measuredDefaultHeight = 106;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 70;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 35;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 306;
> measuredDefaultHeight = 53;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
> }
> @@ -190,7 +190,7 @@ public class TextAreaSkin extends TextSkinBase
>
> protected var isFocused:Boolean = false;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
> /**
> * @private
> @@ -622,37 +622,35 @@ public class TextAreaSkin extends TextSkinBase
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ? getStyle("focusColor")
> : getStyle("borderColor");
> - var selectWidth:uint = isFocused ? layoutBorderSize + 1 :
> layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") == "roundedrect")
> {
> - var halfGap:int = flatheight * 2;
> - //background
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight - halfGap,
> selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight - flatheight,
> unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth - selectWidth,
> unscaledHeight - halfGap, selectWidth, flatheight);
> + graphics.drawRoundRectComplex(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth, roundheight, roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") == "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize * 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth, borderColor, 1);
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") == "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
> @@ -663,8 +661,7 @@ public class TextAreaSkin extends TextSkinBase
> {
> var maxHsp:Number = textDisplayGroup.contentWidth >
> textDisplayGroup.width ?
> textDisplayGroup.contentWidth-textDisplayGroup.width : 0;
> - textDisplayGroup.horizontalScrollPosition =
> -
> Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
> + textDisplayGroup.horizontalScrollPosition =
> Math.min(Math.max(0,textDisplayGroup.horizontalScrollPosition),maxHsp);
>
> var maxVsp:Number = textDisplayGroup.contentHeight >
> textDisplayGroup.height ?
> textDisplayGroup.contentHeight-textDisplayGroup.height : 0;
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> index 3533aa1..f2b243e 100644
> --- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> +++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TextInputSkin.as
> @@ -22,6 +22,7 @@ package spark.skins.ios7
> import flash.events.Event;
> import flash.events.FocusEvent;
> import flash.events.SoftKeyboardEvent;
> + import flash.system.Capabilities;
>
> import mx.core.DPIClassification;
> import mx.core.EventPriority;
> @@ -45,7 +46,7 @@ package spark.skins.ios7
> * @playerversion AIR 2.5
> * @productversion Flex 4.5
> */
> - public class TextInputSkin extends TextSkinBase
> + public class TextInputSkin extends TextSkinBase
> {
>
> //--------------------------------------------------------------------------
> //
> @@ -74,8 +75,8 @@ package spark.skins.ios7
> {
> measuredDefaultWidth = 1200;
> measuredDefaultHeight = 132;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> @@ -83,40 +84,40 @@ package spark.skins.ios7
>
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 100;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 600;
> measuredDefaultHeight = 66;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 50;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 25;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 300;
> measuredDefaultHeight = 33;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
> }
> @@ -132,7 +133,7 @@ package spark.skins.ios7
>
> protected var isFocused:Boolean = false;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
> /**
> * @copy spark.skins.spark.ApplicationSkin#hostComponent
> @@ -290,37 +291,35 @@ package spark.skins.ios7
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ?
> getStyle("focusColor") : getStyle("borderColor");
> - var selectWidth:uint = isFocused ?
> layoutBorderSize + 1 : layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") ==
> "roundedrect")
> {
> - var halfGap:int = flatheight * 2;
> - //background
> + graphics.lineStyle(layoutBorderSize,
> borderColor, 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight -
> halfGap, selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight -
> flatheight, unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth -
> selectWidth, unscaledHeight - halfGap, selectWidth, flatheight);
> +
> graphics.drawRoundRectComplex(layoutBorderSize, layoutBorderSize,
> unscaledWidth - borderWidth, unscaledHeight - borderWidth, roundheight,
> roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize *
> 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth,
> borderColor, 1);
> + graphics.lineStyle(layoutBorderSize,
> borderColor, 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") ==
> "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
>
>
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ef507a46/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> ----------------------------------------------------------------------
> diff --git
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> index 10e0632..89b8b13 100644
> ---
> a/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> +++
> b/frameworks/projects/mobiletheme/src/spark/skins/ios7/supportClasses/StageTextSkinBase.as
> @@ -66,48 +66,48 @@ public class StageTextSkinBase extends MobileSkin
> {
> measuredDefaultWidth = 1200;
> measuredDefaultHeight = 132;
> - layoutBorderSize = 4;
> - flatheight = 9;
> + layoutBorderSize = 3;
> + roundheight = 24;
> break;
> }
> case DPIClassification.DPI_480:
> {
> measuredDefaultWidth = 880;
> measuredDefaultHeight = 100;
> - layoutBorderSize = 3;
> - flatheight = 7;
> + layoutBorderSize = 2;
> + roundheight = 18;
> break;
> }
> case DPIClassification.DPI_320:
> {
> measuredDefaultWidth = 600;
> measuredDefaultHeight = 66;
> - layoutBorderSize = 2;
> - flatheight = 6;
> + layoutBorderSize = 1.5;
> + roundheight = 14;
> break;
> }
> case DPIClassification.DPI_240:
> {
> measuredDefaultWidth = 440;
> measuredDefaultHeight = 50;
> - layoutBorderSize = 2;
> - flatheight = 5;
> + layoutBorderSize = 1;
> + roundheight = 10;
> break;
> }
> case DPIClassification.DPI_120:
> {
> measuredDefaultWidth = 220;
> measuredDefaultHeight = 25;
> - layoutBorderSize = 1;
> - flatheight = 2;
> + layoutBorderSize = .5;
> + roundheight = 5;
> break;
> }
> default:
> {
> measuredDefaultWidth = 300;
> measuredDefaultHeight = 33;
> - layoutBorderSize = 1;
> - flatheight = 3;
> + layoutBorderSize = .5;
> + roundheight = 7;
> break;
> }
>
> @@ -138,7 +138,7 @@ public class StageTextSkinBase extends MobileSkin
> */
> protected var layoutBorderSize:uint;
>
> - protected var flatheight:uint;
> + protected var roundheight:uint;
>
>
> //--------------------------------------------------------------------------
> //
> @@ -216,7 +216,7 @@ public class StageTextSkinBase extends MobileSkin
> *
> * @return instance of IStyleableEditableText
> */
> - protected function createTextDisplay():IStyleableEditableText
> + protected function createTextDisplay():IStyleableEditableText
> {
> return new StyleableStageText(multiline);
> }
> @@ -232,38 +232,36 @@ public class StageTextSkinBase extends MobileSkin
> var contentBackgroundAlpha:Number =
> getStyle("contentBackgroundAlpha");
> //change border color and thickness when in focus
> var borderColor:uint = isFocused ? getStyle("focusColor")
> : getStyle("borderColor");
> - var selectWidth:uint = isFocused ? layoutBorderSize + 1 :
> layoutBorderSize;
> + var borderWidth:uint = layoutBorderSize * 2;
> if (isNaN(contentBackgroundAlpha))
> {
> contentBackgroundAlpha = 1;
> }
> - var halfGap:int = flatheight * 2;
> // change the border type
> - if (getStyle("contentBackgroundBorder") == "flat")
> + if (getStyle("contentBackgroundBorder") == "roundedrect")
> {
> - //background
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1, true);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> - graphics.drawRect(0, 0, unscaledWidth,
> unscaledHeight - flatheight);
> - graphics.endFill();
> - //begin flat border
> - graphics.beginFill(borderColor, 1);
> - //left half border
> - graphics.drawRect(0, unscaledHeight - halfGap,
> selectWidth, flatheight );
> - //bottom border
> - graphics.drawRect(0, unscaledHeight - flatheight,
> unscaledWidth, selectWidth);
> - //right border
> - graphics.drawRect(unscaledWidth - selectWidth,
> unscaledHeight - halfGap, selectWidth, flatheight);
> + graphics.drawRoundRectComplex(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth, roundheight, roundheight, roundheight, roundheight);
> graphics.endFill();
> }
> - else if (getStyle("contentBackgroundBorder") ==
> "rectangle")
> + if (getStyle("contentBackgroundBorder") == "rectangle")
> {
> - var borderWidth:uint = layoutBorderSize * 2;
> +
> //rectangle border and background
> - graphics.lineStyle(selectWidth, borderColor, 1);
> + graphics.lineStyle(layoutBorderSize, borderColor,
> 1);
> graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> graphics.drawRect(layoutBorderSize,
> layoutBorderSize, unscaledWidth - borderWidth, unscaledHeight -
> borderWidth);
> graphics.endFill();
> }
> + else if (getStyle("contentBackgroundBorder") == "none")
> + {
> +
> + //rectangle border and background
> + graphics.beginFill(contentBackgroundColor,
> contentBackgroundAlpha);
> + graphics.drawRect(0, 0, unscaledWidth -
> borderWidth, unscaledHeight - borderWidth);
> + graphics.endFill();
> + }
> }
>
> /**
>
>
[2/3] git commit: [flex-sdk] [refs/heads/iso7skins] - Tweak
VScrollBarkSkin to make sure it looks good in all DPIs
Posted by bi...@apache.org.
Tweak VScrollBarkSkin to make sure it looks good in all DPIs
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e3b1f20e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e3b1f20e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e3b1f20e
Branch: refs/heads/iso7skins
Commit: e3b1f20e756a784063e83aa512033a5a046abd97
Parents: ef507a4
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Tue Nov 18 17:25:44 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Tue Nov 18 17:25:44 2014 -0800
----------------------------------------------------------------------
.../mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3b1f20e/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as
index de32b42..8b86965 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/VScrollBarSkin.as
@@ -75,7 +75,7 @@ public class VScrollBarSkin extends MobileSkin
}
case DPIClassification.DPI_480:
{
- minWidth = 18;
+ minWidth = 16;
paddingRight = VScrollBarThumbSkin.PADDING_RIGHT_480DPI;
paddingVertical = VScrollBarThumbSkin.PADDING_VERTICAL_480DPI;
break;
@@ -89,14 +89,14 @@ public class VScrollBarSkin extends MobileSkin
}
case DPIClassification.DPI_240:
{
- minWidth = 9;
+ minWidth = 8;
paddingRight = VScrollBarThumbSkin.PADDING_RIGHT_240DPI;
paddingVertical = VScrollBarThumbSkin.PADDING_VERTICAL_240DPI;
break;
}
case DPIClassification.DPI_120:
{
- minWidth = 9;
+ minWidth = 4;
paddingRight = VScrollBarThumbSkin.PADDING_RIGHT_120DPI;
paddingVertical = VScrollBarThumbSkin.PADDING_VERTICAL_120DPI;
break;