Merge branch 'dev'
This commit is contained in:
commit
10e7e9a1d5
@ -20,4 +20,9 @@
|
|||||||
-->
|
-->
|
||||||
# Release Notes
|
# Release Notes
|
||||||
|
|
||||||
|
### 0.2.2 (Sept 25, 2013)
|
||||||
|
* CB-4889 bumping&resetting version
|
||||||
|
* CB-4889 renaming org.apache.cordova.core.splashscreen to org.apache.cordova.splashscreen
|
||||||
|
* Rename CHANGELOG.md -> RELEASENOTES.md
|
||||||
|
* [CB-4806] Update splashscreen image bounds for iOS 7
|
||||||
|
* [CB-4752] Incremented plugin version on dev branch.
|
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
|
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
|
||||||
id="org.apache.cordova.core.splashscreen"
|
id="org.apache.cordova.splashscreen"
|
||||||
version="0.2.0">
|
version="0.2.2">
|
||||||
<name>Splashscreen</name>
|
<name>Splashscreen</name>
|
||||||
<description>Cordova Splashscreen Plugin</description>
|
<description>Cordova Splashscreen Plugin</description>
|
||||||
<license>Apache 2.0</license>
|
<license>Apache 2.0</license>
|
||||||
|
@ -171,6 +171,9 @@
|
|||||||
if (CGSizeEqualToSize(screenSize, imgBounds.size)) {
|
if (CGSizeEqualToSize(screenSize, imgBounds.size)) {
|
||||||
CGRect statusFrame = [self.viewController.view convertRect:[UIApplication sharedApplication].statusBarFrame fromView:nil];
|
CGRect statusFrame = [self.viewController.view convertRect:[UIApplication sharedApplication].statusBarFrame fromView:nil];
|
||||||
imgBounds.origin.y -= statusFrame.size.height;
|
imgBounds.origin.y -= statusFrame.size.height;
|
||||||
|
if (!(IsAtLeastiOSVersion(@"7.0"))) {
|
||||||
|
imgBounds.origin.y -= statusFrame.size.height;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
CGRect viewBounds = self.viewController.view.bounds;
|
CGRect viewBounds = self.viewController.view.bounds;
|
||||||
CGFloat imgAspect = imgBounds.size.width / imgBounds.size.height;
|
CGFloat imgAspect = imgBounds.size.width / imgBounds.size.height;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user