thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IOS: Adds iPhone 6/6+ launch screens

Browse source
This commit is contained in:
Vincent Bénony 2015-12-10 18:44:31 +01:00
parent 7324f87b9a
commit cfcd3842ed
8 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/platform/ios7/iOS7AppDelegate.mm
View file

@ -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];
}

1
backends/platform/ios7/ios7_video.h
View file

@ -84,7 +84,6 @@ typedef struct {
GLfloat _mouseScaleX, _mouseScaleY;
int _scaledShakeOffsetY;
CGFloat _contentScaleFactor;
UITouch *_firstTouch;
UITouch *_secondTouch;

7
backends/platform/ios7/ios7_video.mm
View file

@ -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;

23
dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json
View file

@ -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"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "ScummVM-splash-2208x1242.png",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "736h",
"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"
},
{

BIN
dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 896 KiB

27
ports.mk
View file

@ -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)