Repository: flex-sdk Updated Branches: refs/heads/develop b78df4d81 -> e427e0eaa
Fix for https://issues.apache.org/jira/browse/FLEX-34714 Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e427e0ea Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e427e0ea Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e427e0ea Branch: refs/heads/develop Commit: e427e0eaae235f5a90bf72499de17e5ecfe32c21 Parents: b78df4d Author: OmPrakash Muppirala <[email protected]> Authored: Mon Feb 16 15:26:20 2015 -0800 Committer: OmPrakash Muppirala <[email protected]> Committed: Mon Feb 16 15:26:20 2015 -0800 ---------------------------------------------------------------------- .../src/mx/utils/LegacyMobileThemeOverride.as | 10 +++- frameworks/projects/mobiletheme/defaults.css | 55 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e427e0ea/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as b/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as index 31e1621..41f4729 100644 --- a/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as +++ b/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as @@ -40,7 +40,15 @@ package mx.utils } else if(c.version.indexOf("IOS") > -1) { - Platform.mx_internal::iosVersionOverride = "6.0.0"; + /** + * Setting OS version to a very specific value here so + * that we can target it to specify the iOS osStatusBarHeight value + * that fixes the iOS7+ status bar issue. + * At the same time, setting it below 7.0 allows usage of the + * legacy Flex Mobile theme. + * See https://issues.apache.org/jira/browse/FLEX-34714 + */ + Platform.mx_internal::iosVersionOverride = "6.0.1"; } } } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e427e0ea/frameworks/projects/mobiletheme/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css index c39de85..da729aa 100644 --- a/frameworks/projects/mobiletheme/defaults.css +++ b/frameworks/projects/mobiletheme/defaults.css @@ -1408,6 +1408,61 @@ global } } +/* + +A special case where we want to continue using the legacy Flex mobile skins +but still want to specify the status bar height for iOS7+ devices +See https://issues.apache.org/jira/browse/FLEX-34714 + +*/ + +@media (os-platform:"IOS") AND (application-dpi: 120) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 15; + } +} + +@media (os-platform:"IOS") AND (application-dpi: 160) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 20; + } +} + +@media (os-platform:"IOS") AND (application-dpi: 240) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 30; + } +} + +@media (os-platform:"IOS") AND (application-dpi: 320) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 40; + } +} + +@media (os-platform:"IOS") AND (application-dpi: 480) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 60; + } +} + +@media (os-platform:"IOS") AND (application-dpi: 640) AND (min-os-version: 6.0.1) +{ + Application + { + osStatusBarHeight: 80; + } +} /*
