Adjust size and spacing of BeveledBackButton in 120 DPI
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fc1a2ec7 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fc1a2ec7 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fc1a2ec7 Branch: refs/heads/master Commit: fc1a2ec7fc3ea9421528a790b86e6c72d2c437d7 Parents: 7179441 Author: Om <[email protected]> Authored: Mon Feb 24 15:17:05 2014 -0800 Committer: Om <[email protected]> Committed: Mon Feb 24 15:32:20 2014 -0800 ---------------------------------------------------------------------- .../spark/skins/mobile/BeveledBackButtonSkin.as | 3 +-- .../mobile120/assets/BeveledBackButton_down.fxg | 24 +++++++++++--------- .../mobile120/assets/BeveledBackButton_fill.fxg | 9 ++++---- .../mobile120/assets/BeveledBackButton_up.fxg | 24 +++++++++++--------- 4 files changed, 32 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fc1a2ec7/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as index e49403d..c4f0312 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as @@ -146,11 +146,10 @@ public class BeveledBackButtonSkin extends ButtonSkin } case DPIClassification.DPI_120: { - // Note provisional may need changes layoutBorderSize = 0; layoutPaddingTop = 0; layoutPaddingBottom = 0; - layoutPaddingLeft = 12; + layoutPaddingLeft = 14; layoutPaddingRight = 8; measuredDefaultWidth = 44; measuredDefaultHeight = 21; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fc1a2ec7/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg index 923f8d3..d54314a 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_down.fxg @@ -18,29 +18,31 @@ --> + <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"; - scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36"> + scaleGridLeft="0" scaleGridRight="54" scaleGridTop="5" scaleGridBottom="23"> <!-- invisible fix for scaling --> - <Rect x="0" y="0" width="87" height="42"> + <Rect x="0" y="0" width="58" height="28"> <fill> <SolidColor color="#ffffff" alpha="0"/> </fill> </Rect> <!-- border --> - <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813 - 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z"> + <Path winding="nonZero" data="M54 0.666504C55.8374 0.666504 57.333 2.16211 57.333 4L57.333 24C57.333 25.8379 55.8374 27.3335 54 27.3335L12.689 27.3335C10.1973 27.3335 8.9082 24.5771 8.0708 23.7402 8.04297 23.7002 3.56104 17.7588 1 13.9272 3.56445 10.0884 8.09229 4.20508 8.11719 + 4.1709 9.61377 2.28955 10.5415 0.666504 12.667 0.666504L54 0.666504 54 0.666504ZM12.667 0C9.90479 0 9.34375 1.27637 7.57227 3.78564 7.57227 3.78564 2.6665 10 0 14 2.6665 18 7.52295 24.1196 7.52295 24.1196 9.52344 26.7866 10 28 12.667 28L54 28 +C56.209 28 58 26.209 58 24L58 4C58 1.79102 56.209 0 54 0L12.667 0Z"> <fill> <SolidColor color="#323232"/> </fill> </Path> <!-- shadow fill --> - <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457 - 14.5 0 17.5 0L79.5 0 79.5 0Z"> + <Path x="1" y="0.666504" winding="nonZero" data="M53 0C54.8374 0 56.333 1.49561 56.333 3.3335L56.333 23.3335C56.333 25.1714 54.8374 26.667 53 26.667L11.689 26.667C9.19727 26.667 7.9082 23.9106 7.0708 23.0737 7.04297 23.0337 2.56104 17.0923 0 13.2607 2.56445 9.42188 7.09229 3.53857 7.11719 3.50439 + 8.61377 1.62305 9.47949 0 11.667 0L53 0 53 0Z"> <fill> - <LinearGradient x="42.2495" y="0" scaleX="22.6145" rotation="90"> + <LinearGradient x="28.1665" y="0" scaleX="15.0762" rotation="90"> <GradientEntry ratio="0" alpha="0.25"/> <GradientEntry ratio="1" alpha="0"/> </LinearGradient> @@ -48,11 +50,11 @@ </Path> <!-- highlight border --> - <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906 - 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001 - 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z"> + <Path x="1" y="0.666016" winding="nonZero" data="M53 0.666504C54.4702 0.666504 55.666 1.8623 55.666 3.3335L55.666 23.333C55.666 24.8037 54.4702 26.001 53 26.001L11.689 26.001C9.81201 26.001 7.53613 22.5645 7.53613 22.5645 5.89111 19.9683 2.2207 15.3926 0.80127 13.2607 2.20264 11.1592 7.65576 + 3.89697 7.65576 3.89697 7.92725 3.51025 9.82275 0.666504 11.667 0.666504L53 0.666504ZM11.375 0C9.34375 0 8.2085 2.13232 7.11719 3.50391 7.09229 3.53857 2.56445 9.42188 0 13.2607 2.56104 17.0918 7.04297 23.0332 7.0708 23.0732 7.9082 23.9111 9.19727 + 26.6675 11.689 26.6675L53 26.6675C54.8374 26.6675 56.333 25.1714 56.333 23.333L56.333 3.3335C56.333 1.49561 54.8374 0 53 0L11.375 0Z"> <fill> - <LinearGradient x="42.2495" y="0" scaleX="42.7844" rotation="90"> + <LinearGradient x="28.1665" y="0" scaleX="28.5232" rotation="90"> <GradientEntry ratio="0" color="#FFFFFF" alpha="0.05"/> <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/> </LinearGradient> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fc1a2ec7/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg index 4fb534a..3ae5b46 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_fill.fxg @@ -18,19 +18,20 @@ --> + <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"; - scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36"> + scaleGridLeft="13" scaleGridRight="54" scaleGridTop="5" scaleGridBottom="23"> <!-- invisible fix for scaling --> - <Rect x="0" y="0" width="87" height="42"> + <Rect x="0" y="0" width="58" height="28"> <fill> <SolidColor color="#ffffff" alpha="0"/> </fill> </Rect> <!-- chromeColor fill --> - <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457 - 14.313 0 17.5 0L79.5 0 79.5 0Z"> + <Path x="1" y="0.666504" winding="nonZero" data="M53 0C54.8374 0 56.333 1.49561 56.333 3.3335L56.333 23.3335C56.333 25.1714 54.8374 26.667 53 26.667L11.6895 26.667C9.19727 26.667 7.9082 23.9106 7.0708 23.0737 7.04346 23.0337 2.56152 17.0923 0 13.2607 2.56445 9.42188 7.09277 3.53857 7.1167 3.50439 + 8.61377 1.62305 9.54199 0 11.667 0L53 0 53 0Z"> <fill> <SolidColor color="#484848"/> </fill> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fc1a2ec7/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg index 63adf4e..7ae0736 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile120/assets/BeveledBackButton_up.fxg @@ -18,29 +18,31 @@ --> + <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008"; - scaleGridLeft="20" scaleGridRight="80" scaleGridTop="6" scaleGridBottom="36"> + scaleGridLeft="0" scaleGridRight="54" scaleGridTop="3" scaleGridBottom="21"> <!-- invisible fix for scaling --> - <Rect x="0" y="0" width="87" height="42"> + <Rect x="0" y="0" width="58" height="28"> <fill> <SolidColor color="#ffffff" alpha="0"/> </fill> </Rect> <!-- border --> - <Path winding="nonZero" data="M81 1C83.7568 1 86 3.24316 86 6L86 36C86 38.7568 83.7568 41 81 41L19.0337 41.001C15.2959 41.001 13.3623 36.8662 12.1064 35.6104 12.0649 35.5498 5.34229 26.6387 1.5 20.8906 5.34668 15.1328 12.1392 6.30762 12.1753 6.25586 14.4209 3.43457 15.813 - 1 19 1L81 1 81 1ZM19 0C14.8569 0 14.0151 1.91504 11.3584 5.67871 11.3584 5.67871 4 15 0 21 4 27 11.2847 36.1797 11.2847 36.1797 14.2847 40.1797 15 42 19 42L81 42C84.3135 42 87 39.3135 87 36L87 6C87 2.68652 84.3135 0 81 0L19 0Z"> + <Path winding="nonZero" data="M54 0.666504C55.8374 0.666504 57.333 2.16211 57.333 4L57.333 24C57.333 25.8379 55.8374 27.3335 54 27.3335L12.6895 27.3335C10.1973 27.3335 8.9082 24.5771 8.0708 23.7402 8.04346 23.7002 3.56152 17.7588 1 13.9272 3.56445 10.0884 8.09277 4.20508 8.1167 + 4.1709 9.61377 2.28955 10.542 0.666504 12.667 0.666504L54 0.666504 54 0.666504ZM12.667 0C9.9043 0 9.34326 1.27637 7.57227 3.78564 7.57227 3.78564 2.6665 10 0 14 2.6665 18 7.52295 24.1196 7.52295 24.1196 9.52344 26.7866 10 28 12.667 28L54 28C56.209 + 28 58 26.209 58 24L58 4C58 1.79102 56.209 0 54 0L12.667 0Z"> <fill> <SolidColor color="#323232"/> </fill> </Path> <!-- shadow fill --> - <Path x="1.5" y="1" winding="nonZero" data="M79.5 0C82.2568 0 84.5 2.24316 84.5 5L84.5 35C84.5 37.7568 82.2568 40 79.5 40L17.5337 40.001C13.7959 40.001 11.8623 35.8662 10.6064 34.6104 10.5649 34.5498 3.84229 25.6387 0 19.8906 3.84668 14.1328 10.6392 5.30762 10.6753 5.25586 12.9209 2.43457 - 14.5 0 17.5 0L79.5 0 79.5 0Z"> + <Path x="1" y="0.666504" winding="nonZero" data="M53 0C54.8374 0 56.333 1.49561 56.333 3.3335L56.333 23.3335C56.333 25.1714 54.8374 26.667 53 26.667L11.6895 26.667C9.19727 26.667 7.9082 23.9106 7.0708 23.0737 7.04346 23.0337 2.56152 17.0923 0 13.2607 2.56445 9.42188 7.09277 3.53857 7.1167 3.50439 + 8.61377 1.62305 9.6665 0 11.667 0L53 0 53 0Z"> <fill> - <LinearGradient x="42.2495" y="-0.784668" scaleX="40.6027" rotation="90"> + <LinearGradient x="28.1665" y="-0.522949" scaleX="27.0682" rotation="90"> <GradientEntry ratio="0" color="#FFFFFF" alpha="0.4"/> <GradientEntry ratio="1" color="#FFFFFF" alpha="0.1"/> </LinearGradient> @@ -48,11 +50,11 @@ </Path> <!-- highlight border --> - <Path x="1.5" y="0.999023" winding="nonZero" data="M79.5 1C81.7051 1 83.5 2.79395 83.5 5L83.5 35C83.5 37.2061 81.7051 39.001 79.5 39.001L17.5337 39.001C14.7188 39.001 11.3052 33.8457 11.3052 33.8457 8.83691 29.9521 3.33154 23.0889 1.20215 19.8906 3.3042 16.7393 11.4839 5.8457 11.4839 5.8457 11.8906 - 5.26562 14.7344 1 17.5 1L79.5 1M17.1719 0C14.375 0 12.313 3.19824 10.6753 5.25586 10.6392 5.30762 3.84668 14.1328 0 19.8906 3.84229 25.6387 10.5649 34.5498 10.6064 34.6104 11.8623 35.8662 13.7959 40.001 17.5337 40.001L79.5 40.001C82.2568 40.001 - 84.5 37.7568 84.5 35L84.5 5C84.5 2.24316 82.2568 0 79.375 0L17.1719 0Z"> + <Path x="1" y="0.666016" winding="nonZero" data="M53 0.666504C54.4702 0.666504 55.6665 1.8623 55.6665 3.3335L55.6665 23.333C55.6665 24.8037 54.4702 26.001 53 26.001L11.6895 26.001C9.8125 26.001 7.53662 22.5645 7.53662 22.5645 5.89111 19.9683 2.2207 15.3926 0.80127 13.2607 2.20264 11.1592 7.65576 + 3.89697 7.65576 3.89697 7.92676 3.51025 9.82275 0.666504 11.667 0.666504L53 0.666504ZM11.4482 0C9.58301 0 8.2085 2.13232 7.1167 3.50391 7.09277 3.53857 2.56445 9.42188 0 13.2607 2.56152 17.0918 7.04346 23.0332 7.0708 23.0732 7.9082 23.9111 9.19727 + 26.6675 11.6895 26.6675L53 26.6675C54.8374 26.6675 56.333 25.1714 56.333 23.333L56.333 3.3335C56.333 1.49561 54.8374 0 52.9165 0L11.4482 0Z"> <fill> - <LinearGradient x="42.2495" y="0" scaleX="40.0015" rotation="90"> + <LinearGradient x="28.1665" y="0" scaleX="26.6675" rotation="90"> <GradientEntry ratio="0" alpha="0.35"/> <GradientEntry ratio="0.662577" alpha="0.1"/> <GradientEntry ratio="0.871166" color="#FFFFFF" alpha="0.05"/>
