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 <[email protected]> Authored: Tue Nov 18 17:28:58 2014 -0800 Committer: OmPrakash Muppirala <[email protected]> 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>
