id/doom-ios
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-iOS.git synced 2025-05-30 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8 from dnicolson/fix-tvos-navigation

Browse source 
Fix tvOS navigation
This commit is contained in:
Tom Kidd 2022-08-01 20:24:56 -05:00 • committed by GitHub
commit 41fa110a26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
code/iphone/MainMenuViewController.mm
View file

@ -413,11 +413,6 @@ BOOL settingsMenuSelected = NO;
*/ */
- (void) ShowPlayBanner { - (void) ShowPlayBanner {
[ mPlayButton setEnabled: NO ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: YES ];
[ mPlaySubMenu Show ]; [ mPlaySubMenu Show ];
[ mSettingsSubMenu Hide ]; [ mSettingsSubMenu Hide ];
[ mExtrasSubMenu Hide ]; [ mExtrasSubMenu Hide ];
@ -430,6 +425,11 @@ BOOL settingsMenuSelected = NO;
aboutMenuSelected = NO; aboutMenuSelected = NO;
[self setNeedsFocusUpdate]; [self setNeedsFocusUpdate];
[self updateFocusIfNeeded]; [self updateFocusIfNeeded];
#else
[ mPlayButton setEnabled: NO ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: YES ];
#endif #endif
} }
@ -441,11 +441,6 @@ BOOL settingsMenuSelected = NO;
*/ */
- (void) ShowSettingsBanner { - (void) ShowSettingsBanner {
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: NO ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: YES ];
[ mSettingsSubMenu Show ]; [ mSettingsSubMenu Show ];
[ mPlaySubMenu Hide ]; [ mPlaySubMenu Hide ];
[ mExtrasSubMenu Hide ]; [ mExtrasSubMenu Hide ];
@ -458,7 +453,13 @@ BOOL settingsMenuSelected = NO;
aboutMenuSelected = NO; aboutMenuSelected = NO;
[self setNeedsFocusUpdate]; [self setNeedsFocusUpdate];
[self updateFocusIfNeeded]; [self updateFocusIfNeeded];
#else
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: NO ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: YES ];
#endif #endif
} }
/* /*
@ -468,11 +469,6 @@ BOOL settingsMenuSelected = NO;
*/ */
- (void) ShowAboutBanner { - (void) ShowAboutBanner {
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: NO ];
[ mExtrasButton setEnabled: YES ];
[ mAboutSubMenu Show ]; [ mAboutSubMenu Show ];
[ mPlaySubMenu Hide ]; [ mPlaySubMenu Hide ];
[ mSettingsSubMenu Hide ]; [ mSettingsSubMenu Hide ];
@ -485,6 +481,11 @@ BOOL settingsMenuSelected = NO;
aboutMenuSelected = YES; aboutMenuSelected = YES;
[self setNeedsFocusUpdate]; [self setNeedsFocusUpdate];
[self updateFocusIfNeeded]; [self updateFocusIfNeeded];
#else
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: NO ];
[ mExtrasButton setEnabled: YES ];
#endif #endif
} }
@ -505,17 +506,11 @@ BOOL settingsMenuSelected = NO;
// //
// Sound_StartLocalSound( "iphone/baborted_01.wav" ); // Sound_StartLocalSound( "iphone/baborted_01.wav" );
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: NO ];
[ mSettingsSubMenu Hide ]; [ mSettingsSubMenu Hide ];
[ mPlaySubMenu Hide ]; [ mPlaySubMenu Hide ];
[ mExtrasSubMenu Show ]; [ mExtrasSubMenu Show ];
[ mAboutSubMenu Hide ]; [ mAboutSubMenu Hide ];
#if TARGET_OS_TV #if TARGET_OS_TV
playMenuSelected = NO; playMenuSelected = NO;
extrasMenuSelected = YES; extrasMenuSelected = YES;
@ -523,6 +518,11 @@ BOOL settingsMenuSelected = NO;
aboutMenuSelected = NO; aboutMenuSelected = NO;
[self setNeedsFocusUpdate]; [self setNeedsFocusUpdate];
[self updateFocusIfNeeded]; [self updateFocusIfNeeded];
#else
[ mPlayButton setEnabled: YES ];
[ mSettingsButton setEnabled: YES ];
[ mAboutButton setEnabled: YES ];
[ mExtrasButton setEnabled: NO ];
#endif #endif
} }