From e058034a24ec11c1429c8be7e37b30cc2b98dea4 Mon Sep 17 00:00:00 2001 From: meancoot Date: Sun, 3 Mar 2013 23:28:22 -0500 Subject: [PATCH] (iOS) Make pause button briefly visible when game starts (again), and give it an image background. I took ps_next.png from the overlays dir and flipped it, 'cause I'm lazy. --- ios/Assets/PauseIndicatorView.xib | 52 +++++++++++++----------- ios/Assets/ic_pause.png | Bin 0 -> 2885 bytes ios/RetroArch.xcodeproj/project.pbxproj | 6 +++ ios/RetroArch/RetroArch_iOS.m | 27 ++++++------ 4 files changed, 49 insertions(+), 36 deletions(-) create mode 100644 ios/Assets/ic_pause.png 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 0000000000000000000000000000000000000000..b024ca8713f557033cd710001b7f920b7316dc8c GIT binary patch literal 2885 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 literal 0 HcmV?d00001 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;