From 171f1531b3bf337ca23b7a5f29bd578d443680d8 Mon Sep 17 00:00:00 2001 From: meancoot Date: Mon, 27 May 2013 13:04:00 -0400 Subject: [PATCH] (iOS) Change view layouts to support ios 5 (still needs ios 6 for building though) --- ios/Assets/PauseIndicatorView.xib | 181 +++--- ios/Assets/PauseView.xib | 831 +----------------------- ios/RetroArch.xcodeproj/project.pbxproj | 4 +- ios/RetroArch/RAGameView.m | 1 + 4 files changed, 89 insertions(+), 928 deletions(-) diff --git a/ios/Assets/PauseIndicatorView.xib b/ios/Assets/PauseIndicatorView.xib index 36e8e50925..945d91f088 100644 --- a/ios/Assets/PauseIndicatorView.xib +++ b/ios/Assets/PauseIndicatorView.xib @@ -2,16 +2,15 @@ 1552 - 12C60 + 12D78 3084 - 1187.34 - 625.00 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 2083 - IBNSLayoutConstraint IBProxyObject IBUIButton IBUIView @@ -39,8 +38,9 @@ 292 - {768, 1005} + {100, 40} + _NS:9 3 @@ -48,6 +48,7 @@ NO 5 + 1 IBIPadFramework 0 0 @@ -75,8 +76,9 @@ - {{0, 20}, {768, 1004}} + {{0, 20}, {100, 40}} + {250, 250} @@ -85,6 +87,10 @@ 2 + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + IBIPadFramework @@ -112,70 +118,6 @@ 1 - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - @@ -197,26 +139,6 @@ - - 61 - - - - - 63 - - - - - 69 - - - - - 72 - - - @@ -225,20 +147,9 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -246,7 +157,72 @@ 72 - + + + + RetroArch_iOS + UINavigationController + + id + id + id + id + id + id + id + id + id + id + + + + chooseState: + id + + + closeGamePressed: + id + + + closePauseMenu: + id + + + loadState: + id + + + resetGame: + id + + + saveState: + id + + + showPauseMenu: + id + + + showRGUI: + id + + + startBluetooth + id + + + stopBluetooth + id + + + + IBProjectSource + ./Classes/RetroArch_iOS.h + + + + 0 IBIPadFramework YES @@ -255,7 +231,6 @@ ic_pause.png {100, 40} - YES 2083 diff --git a/ios/Assets/PauseView.xib b/ios/Assets/PauseView.xib index e56c6f0d1c..6a3a7d88ba 100644 --- a/ios/Assets/PauseView.xib +++ b/ios/Assets/PauseView.xib @@ -11,7 +11,6 @@ 2083 - IBNSLayoutConstraint IBProxyObject IBUIButton IBUISegmentedControl @@ -42,7 +41,6 @@ 292 {{160, 237}, {120, 44}} - _NS:9 NO IBIPadFramework @@ -77,8 +75,7 @@ 292 {{20, 20}, {120, 44}} - - + _NS:9 NO IBIPadFramework @@ -95,12 +92,11 @@ - + 292 {{160, 20}, {120, 44}} - _NS:9 NO @@ -123,7 +119,6 @@ 292 {{20, 237}, {120, 44}} - _NS:9 NO @@ -146,7 +141,6 @@ 292 {{20, 186}, {120, 44}} - _NS:9 NO @@ -169,7 +163,6 @@ 292 {{160, 186}, {120, 44}} - _NS:9 NO @@ -192,7 +185,6 @@ 292 {{20, 135}, {260, 44}} - _NS:9 NO @@ -266,7 +258,6 @@ 292 {{20, 71}, {120, 44}} - _NS:9 NO @@ -289,7 +280,6 @@ 292 {{160, 71}, {120, 44}} - _NS:9 NO @@ -310,7 +300,6 @@ {{0, 20}, {300, 300}} - 3 @@ -408,7 +397,7 @@ showRGUI: - + 7 @@ -435,471 +424,7 @@ - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - + @@ -923,24 +448,7 @@ 17 - - - - 7 - 0 - - 0 - 1 - - 120 - - 1000 - - 3 - 9 - 1 - - + @@ -980,182 +488,10 @@ 170 - - - - - 7 - 0 - - 0 - 1 - - 120 - - 1000 - - 3 - 9 - 1 - - + + - - 180 - - - - - 181 - - - - - 182 - - - - - 183 - - - - - 184 - - - - - 185 - - - - - 186 - - - - - 187 - - - - - 188 - - - - - 189 - - - - - 190 - - - - - 191 - - - - - 192 - - - - - 193 - - - - - 194 - - - - - 195 - - - - - 196 - - - - - 197 - - - - - 198 - - - - - 199 - - - - - 200 - - - - - 201 - - - - - 202 - - - - - 203 - - - - - 204 - - - - - 205 - - - - - 206 - - - - - 207 - - - - - 208 - - - - - 209 - - - - - 210 - - - @@ -1164,93 +500,16 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - @@ -1258,85 +517,11 @@ 210 - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - RetroArch_iOS - UINavigationController - - id - id - id - id - id - id - id - id - id - id - - - - chooseState: - id - - - closeGamePressed: - id - - - closePauseMenu: - id - - - loadState: - id - - - resetGame: - id - - - saveState: - id - - - showPauseMenu: - id - - - showRGUI: - id - - - startBluetooth - id - - - stopBluetooth - id - - - - IBProjectSource - ./Classes/RetroArch_iOS.h - - - - + 0 IBIPadFramework YES 3 - YES 2083 diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj index 1806e611c8..57efa6b139 100644 --- a/ios/RetroArch.xcodeproj/project.pbxproj +++ b/ios/RetroArch.xcodeproj/project.pbxproj @@ -461,7 +461,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RetroArch/RetroArch-Prefix.pch"; INFOPLIST_FILE = "RetroArch/RetroArch-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; LD_NO_PIE = YES; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -508,7 +508,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RetroArch/RetroArch-Prefix.pch"; INFOPLIST_FILE = "RetroArch/RetroArch-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; LD_NO_PIE = YES; LIBRARY_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/RetroArch/RAGameView.m b/ios/RetroArch/RAGameView.m index 9e3221d02c..48402ba7bd 100644 --- a/ios/RetroArch/RAGameView.m +++ b/ios/RetroArch/RAGameView.m @@ -72,6 +72,7 @@ static UIView* g_pause_indicator_view; g_pause_view.frame = CGRectMake(width / 2.0f - 150.0f, height / 2.0f - 150.0f, 300.0f, 300.0f); g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth); + [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth); } - (void)openPauseMenu