diff options
| -rw-r--r-- | backends/platform/ios7/iOS7AppDelegate.mm | 6 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_video.h | 1 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_video.mm | 7 | ||||
| -rw-r--r-- | dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json | 21 | ||||
| -rw-r--r-- | dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png | bin | 0 -> 1624064 bytes | |||
| -rw-r--r-- | dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png | bin | 0 -> 2234609 bytes | |||
| -rw-r--r-- | dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png | bin | 0 -> 917056 bytes | |||
| -rw-r--r-- | ports.mk | 27 |
8 files changed, 45 insertions, 17 deletions
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm index 0f645e5055..d664f91ccc 100644 --- a/backends/platform/ios7/iOS7AppDelegate.mm +++ b/backends/platform/ios7/iOS7AppDelegate.mm @@ -30,7 +30,7 @@ } - (void)applicationDidFinishLaunching:(UIApplication *)application { - CGRect rect = [[UIScreen mainScreen] bounds]; + CGRect rect = [[UIScreen mainScreen] bounds]; // Create the directory for savegames #ifdef IPHONE_OFFICIAL @@ -63,11 +63,11 @@ [NSThread detachNewThreadSelector:@selector(mainLoop:) toTarget:self withObject:nil]; } -- (void)applicationDidEnterBackground:(UIApplication *)application { +- (void)applicationWillResignActive:(UIApplication *)application { [_view applicationSuspend]; } -- (void)applicationWillEnterForeground:(UIApplication *)application { +- (void)applicationDidBecomeActive:(UIApplication *)application { [_view applicationResume]; } diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h index bed552c7cf..799cd21a94 100644 --- a/backends/platform/ios7/ios7_video.h +++ b/backends/platform/ios7/ios7_video.h @@ -84,7 +84,6 @@ typedef struct { GLfloat _mouseScaleX, _mouseScaleY; int _scaledShakeOffsetY; - CGFloat _contentScaleFactor; UITouch *_firstTouch; UITouch *_secondTouch; diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm index fe2285253c..300ab044a7 100644 --- a/backends/platform/ios7/ios7_video.mm +++ b/backends/platform/ios7/ios7_video.mm @@ -380,8 +380,7 @@ uint getSizeNextPOT(uint size) { g_fullWidth = (int)MAX(frame.size.width, frame.size.height); g_fullHeight = (int)MIN(frame.size.width, frame.size.height); - _contentScaleFactor = [[UIScreen mainScreen] scale]; - [self setContentScaleFactor:_contentScaleFactor]; + [self setContentScaleFactor:[[UIScreen mainScreen] scale]]; _scalerMemorySrc = NULL; _scalerMemoryDst = NULL; @@ -831,8 +830,8 @@ uint getSizeNextPOT(uint size) { - (bool)getMouseCoords:(CGPoint)point eventX:(int *)x eventY:(int *)y { // We scale the input according to our scale factor to get actual screen // coordinates. - point.x *= _contentScaleFactor; - point.y *= _contentScaleFactor; + point.x *= self.contentScaleFactor; + point.y *= self.contentScaleFactor; CGRect *area; int width, height, offsetY; diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json b/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json index 139f4e7756..40e3b1e3dd 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,27 +1,30 @@ { "images" : [ { - "orientation" : "portrait", - "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "8.0", + "idiom" : "iphone", "subtype" : "736h", + "filename" : "ScummVM-splash-1242x2208.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", "scale" : "3x" }, { - "orientation" : "landscape", - "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "8.0", + "idiom" : "iphone", "subtype" : "736h", + "filename" : "ScummVM-splash-2208x1242.png", + "minimum-system-version" : "8.0", + "orientation" : "landscape", "scale" : "3x" }, { - "orientation" : "portrait", - "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "8.0", + "idiom" : "iphone", "subtype" : "667h", + "filename" : "ScummVM-splash-750x1334.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", "scale" : "2x" }, { diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png Binary files differnew file mode 100644 index 0000000000..c70153b1f7 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png Binary files differnew file mode 100644 index 0000000000..33b3740092 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png Binary files differnew file mode 100644 index 0000000000..630502974a --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png @@ -136,6 +136,30 @@ ios7bundle: ios7 print "\t<array>";\ print "\t\t<dict>";\ print "\t\t\t<key>UILaunchImageMinimumOSVersion</key>";\ + print "\t\t\t<string>8.0</string>";\ + print "\t\t\t<key>UILaunchImageName</key>";\ + print "\t\t\t<string>LaunchImage-800-Portrait-736h</string>";\ + print "\t\t\t<key>UILaunchImageOrientation</key>";\ + print "\t\t\t<string>Portrait</string>";\ + print "\t\t\t<key>UILaunchImageSize</key>";\ + print "\t\t\t<string>{414, 736}</string>";\ + print "\t\t\t<key>UILaunchImageMinimumOSVersion</key>";\ + print "\t\t\t<string>8.0</string>";\ + print "\t\t\t<key>UILaunchImageName</key>";\ + print "\t\t\t<string>LaunchImage-800-Landscape-736h</string>";\ + print "\t\t\t<key>UILaunchImageOrientation</key>";\ + print "\t\t\t<string>Landscape</string>";\ + print "\t\t\t<key>UILaunchImageSize</key>";\ + print "\t\t\t<string>{414, 736}</string>";\ + print "\t\t\t<key>UILaunchImageMinimumOSVersion</key>";\ + print "\t\t\t<string>8.0</string>";\ + print "\t\t\t<key>UILaunchImageName</key>";\ + print "\t\t\t<string>LaunchImage-800-667h</string>";\ + print "\t\t\t<key>UILaunchImageOrientation</key>";\ + print "\t\t\t<string>Portrait</string>";\ + print "\t\t\t<key>UILaunchImageSize</key>";\ + print "\t\t\t<string>{375, 667}</string>";\ + print "\t\t\t<key>UILaunchImageMinimumOSVersion</key>";\ print "\t\t\t<string>7.0</string>";\ print "\t\t\t<key>UILaunchImageName</key>";\ print "\t\t\t<string>LaunchImage-700-568h</string>";\ @@ -196,6 +220,9 @@ endif cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png $(bundle_name)/LaunchImage-700-Landscape~ipad.png cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png $(bundle_name)/LaunchImage-700-Portrait@2x~ipad.png cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png $(bundle_name)/LaunchImage-700-Portrait~ipad.png + cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png $(bundle_name)/LaunchImage-800-Portrait-736h@3x.png + cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png $(bundle_name)/LaunchImage-800-Landscape-736h@3x.png + cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png $(bundle_name)/LaunchImage-800-667h@2x.png # Location of static libs for the iPhone ifneq ($(BACKEND), iphone) |
