Updated Branches: refs/heads/develop 87f8d135d -> 46844a7d2
FLEX-33659 fix confusion between 120 and 160 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/46844a7d Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/46844a7d Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/46844a7d Branch: refs/heads/develop Commit: 46844a7d26a567ee19c0139ff9703b06f92d1fa1 Parents: 87f8d13 Author: Justin Mclean <jmcl...@apache.org> Authored: Mon Sep 9 13:20:52 2013 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Mon Sep 9 13:20:52 2013 +1000 ---------------------------------------------------------------------- .../src/spark/skins/mobile/ButtonBarLastButtonSkin.as | 8 ++++---- .../skins/mobile/supportClasses/ActionBarButtonSkinBase.as | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/46844a7d/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as index 64248f8..6b077d3 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as @@ -107,11 +107,11 @@ public class ButtonBarLastButtonSkin extends ButtonBarButtonSkinBase break; } - case DPIClassification.DPI_160: + case DPIClassification.DPI_120: { - upBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_up; - downBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_down; - selectedBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_selected; + upBorderSkin = spark.skins.mobile120.assets.ButtonBarLastButton_up; + downBorderSkin = spark.skins.mobile120.assets.ButtonBarLastButton_down; + selectedBorderSkin = spark.skins.mobile120.assets.ButtonBarLastButton_selected; cornerRadius = 4; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/46844a7d/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as index 4c7070b..e9dfc51 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as @@ -122,7 +122,7 @@ public class ActionBarButtonSkinBase extends ButtonSkin measuredDefaultHeight = 65; break; } - case DPIClassification.DPI_160: + case DPIClassification.DPI_120: { // Note provisional may need changes layoutBorderSize = 1;