diff --git a/ios/Assets/PauseIndicatorView.xib b/ios/Assets/PauseIndicatorView.xib index 78973a1ccb..36e8e50925 100644 --- a/ios/Assets/PauseIndicatorView.xib +++ b/ios/Assets/PauseIndicatorView.xib @@ -42,12 +42,15 @@ {768, 1005} _NS:9 + + 3 + MCAwAA + NO + 5 IBIPadFramework 0 0 - 1 - Pause 3 MQA @@ -56,9 +59,10 @@ 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - 3 - MC41AA + + + NSImage + ic_pause.png 2 @@ -75,13 +79,7 @@ {250, 250} - - 3 - MQA - - 2 - - + NO 0.0 @@ -114,21 +112,21 @@ 1 - + - 4 + 10 0 - 4 + 10 1 0.0 1000 - 8 - 29 - 3 + 5 + 22 + 2 @@ -215,8 +213,8 @@ - 70 - + 72 + @@ -227,30 +225,36 @@ 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 - 71 + 72 0 IBIPadFramework YES 3 + + ic_pause.png + {100, 40} + YES 2083 diff --git a/ios/Assets/ic_pause.png b/ios/Assets/ic_pause.png new file mode 100644 index 0000000000..b024ca8713 Binary files /dev/null and b/ios/Assets/ic_pause.png differ diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj index 9527517a9e..fbde213b57 100644 --- a/ios/RetroArch.xcodeproj/project.pbxproj +++ b/ios/RetroArch.xcodeproj/project.pbxproj @@ -125,6 +125,8 @@ 966B9CCA16E41EC1005B61E1 /* PauseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CC716E41EC1005B61E1 /* PauseView.xib */; }; 966B9CCB16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */; }; 966B9CCC16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */; }; + 967D646F16E45428006BA1F2 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 967D646E16E45428006BA1F2 /* ic_pause.png */; }; + 967D647016E45428006BA1F2 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 967D646E16E45428006BA1F2 /* ic_pause.png */; }; 96AFAE2A16C1D4EA009DE44C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2916C1D4EA009DE44C /* UIKit.framework */; }; 96AFAE2C16C1D4EA009DE44C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2B16C1D4EA009DE44C /* Foundation.framework */; }; 96AFAE2E16C1D4EA009DE44C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2D16C1D4EA009DE44C /* CoreGraphics.framework */; }; @@ -233,6 +235,7 @@ 966B9CBC16E41E7A005B61E1 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 966B9CC716E41EC1005B61E1 /* PauseView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PauseView.xib; sourceTree = ""; }; 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PauseIndicatorView.xib; sourceTree = ""; }; + 967D646E16E45428006BA1F2 /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_pause.png; sourceTree = ""; }; 96AFAE2516C1D4EA009DE44C /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96AFAE2916C1D4EA009DE44C /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 96AFAE2B16C1D4EA009DE44C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -464,6 +467,7 @@ 966B9CBA16E41E7A005B61E1 /* Default@2x.png */, 962979F416C43B9500E6DCE0 /* ic_dir.png */, 962979F516C43B9500E6DCE0 /* ic_file.png */, + 967D646E16E45428006BA1F2 /* ic_pause.png */, 966B9CBB16E41E7A005B61E1 /* Icon-72.png */, 966B9CBC16E41E7A005B61E1 /* Icon.png */, 966B9CC716E41EC1005B61E1 /* PauseView.xib */, @@ -832,6 +836,7 @@ 966B9CC616E41E7A005B61E1 /* Icon.png in Resources */, 966B9CCA16E41EC1005B61E1 /* PauseView.xib in Resources */, 966B9CCC16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */, + 967D647016E45428006BA1F2 /* ic_pause.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -850,6 +855,7 @@ 966B9CC516E41E7A005B61E1 /* Icon.png in Resources */, 966B9CC916E41EC1005B61E1 /* PauseView.xib in Resources */, 966B9CCB16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */, + 967D646F16E45428006BA1F2 /* ic_pause.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/RetroArch/RetroArch_iOS.m b/ios/RetroArch/RetroArch_iOS.m index d0713e6d6b..c57a186f73 100644 --- a/ios/RetroArch/RetroArch_iOS.m +++ b/ios/RetroArch/RetroArch_iOS.m @@ -152,6 +152,17 @@ _pauseView.frame = CGRectMake(width / 2.0f - 150.0f, height / 2.0f - 150.0f, 300.0f, 300.0f); _pauseIndicatorView.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth); + _pauseIndicatorView.hidden = NO; + + [self performSelector:@selector(hidePauseButton) withObject:self afterDelay:3.0f]; +} + +- (void)hidePauseButton +{ + [UIView animateWithDuration:0.2 + animations:^ { _pauseIndicatorView.alpha = ALMOST_INVISIBLE; } + completion:^(BOOL finished) { } + ]; } - (void)pushViewController:(UIViewController*)theView isGame:(BOOL)game @@ -171,8 +182,8 @@ { _game = (RAGameView*)theView; - _pauseIndicatorView.alpha = ALMOST_INVISIBLE; - _pauseIndicatorView.userInteractionEnabled = YES; + _pauseIndicatorView.alpha = 1.0f; + _pauseIndicatorView.hidden = YES; [theView.view addSubview:_pauseView]; [theView.view addSubview:_pauseIndicatorView]; @@ -303,11 +314,7 @@ stateSelect.selectedSegmentIndex = (g_extern.state_slot < 10) ? g_extern.state_slot : -1; [UIView animateWithDuration:0.2 - animations:^ - { - _pauseIndicatorView.alpha = ALMOST_INVISIBLE; - _pauseView.alpha = 1.0f; - } + animations:^ { _pauseView.alpha = 1.0f; } completion:^(BOOL finished){}]; } } @@ -339,11 +346,7 @@ { if (_isPaused) [UIView animateWithDuration:0.2 - animations:^ - { - _pauseView.alpha = 0.0f; - _pauseIndicatorView.alpha = ALMOST_INVISIBLE; - } + animations:^ { _pauseView.alpha = 0.0f; } completion:^(BOOL finished) { _isPaused = false;