From cfcd3842ed0b46c1eeb7d1e490a882e5d3f26441 Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Thu, 10 Dec 2015 18:44:31 +0100
Subject: IOS: Adds iPhone 6/6+ launch screens

---
 backends/platform/ios7/iOS7AppDelegate.mm | 6 +++---
 backends/platform/ios7/ios7_video.h       | 1 -
 backends/platform/ios7/ios7_video.mm      | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'backends/platform')

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;
-- 
cgit v1.2.3