You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by jc...@apache.org on 2016/09/01 18:13:13 UTC
[1/2] cordova-plugin-statusbar git commit: Handle extended status bar
on iOS
Repository: cordova-plugin-statusbar
Updated Branches:
refs/heads/master f2c49454d -> 1d1ac928a
Handle extended status bar on iOS
This closes #55
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/commit/554e65e6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/tree/554e65e6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/diff/554e65e6
Branch: refs/heads/master
Commit: 554e65e60f7f801f23553929386e8bdcf3835a15
Parents: f2c4945
Author: Gosha Arinich <me...@goshakkk.name>
Authored: Thu Apr 7 16:44:32 2016 +0300
Committer: Julio C�sar <jc...@gmail.com>
Committed: Thu Sep 1 20:01:42 2016 +0200
----------------------------------------------------------------------
src/ios/CDVStatusBar.m | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/blob/554e65e6/src/ios/CDVStatusBar.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVStatusBar.m b/src/ios/CDVStatusBar.m
index ba4c04e..3f87a13 100644
--- a/src/ios/CDVStatusBar.m
+++ b/src/ios/CDVStatusBar.m
@@ -442,7 +442,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
if (isIOS7) {
CGRect bounds = [[UIScreen mainScreen] bounds];
bounds = [self invertFrameIfNeeded:bounds];
-
+
if (UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation])) {
self.viewController.view.frame = bounds;
} else if (self.viewController.presentedViewController != nil) {
@@ -462,7 +462,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
}
}
self.webView.frame = bounds;
-
+
if (!self.statusBarOverlaysWebView) {
CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
@@ -470,6 +470,15 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
frame.origin.y = statusBarFrame.size.height;
frame.size.height -= statusBarFrame.size.height;
self.webView.frame = frame;
+ } else {
+ // even if overlay is used, we want to handle in-call/recording/hotspot larger status bar
+ CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
+ statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
+ CGRect frame = self.webView.frame;
+ CGFloat height = statusBarFrame.size.height;
+ frame.origin.y = height >= 20 ? height - 20 : 0;
+ frame.size.height -= frame.origin.y;
+ self.webView.frame = frame;
}
} else {
CGRect bounds = [[UIScreen mainScreen] applicationFrame];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-plugin-statusbar git commit: Removed duplicate code
Posted by jc...@apache.org.
Removed duplicate code
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/commit/1d1ac928
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/tree/1d1ac928
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/diff/1d1ac928
Branch: refs/heads/master
Commit: 1d1ac928a858c899a2a3aa87c86fe4cd42b99bb3
Parents: 554e65e
Author: Julio C�sar <jc...@gmail.com>
Authored: Thu Sep 1 20:12:20 2016 +0200
Committer: Julio C�sar <jc...@gmail.com>
Committed: Thu Sep 1 20:12:20 2016 +0200
----------------------------------------------------------------------
src/ios/CDVStatusBar.m | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-statusbar/blob/1d1ac928/src/ios/CDVStatusBar.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVStatusBar.m b/src/ios/CDVStatusBar.m
index 3f87a13..3e86de6 100644
--- a/src/ios/CDVStatusBar.m
+++ b/src/ios/CDVStatusBar.m
@@ -463,23 +463,20 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
}
self.webView.frame = bounds;
+ CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
+ statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
+ CGRect frame = self.webView.frame;
+
if (!self.statusBarOverlaysWebView) {
- CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
- statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
- CGRect frame = self.webView.frame;
frame.origin.y = statusBarFrame.size.height;
frame.size.height -= statusBarFrame.size.height;
- self.webView.frame = frame;
} else {
// even if overlay is used, we want to handle in-call/recording/hotspot larger status bar
- CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
- statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
- CGRect frame = self.webView.frame;
CGFloat height = statusBarFrame.size.height;
frame.origin.y = height >= 20 ? height - 20 : 0;
frame.size.height -= frame.origin.y;
- self.webView.frame = frame;
}
+ self.webView.frame = frame;
} else {
CGRect bounds = [[UIScreen mainScreen] applicationFrame];
self.viewController.view.frame = bounds;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org