mirror of
https://github.com/id-Software/DOOM-iOS.git
synced 2025-05-29 16:21:08 +00:00
Merge pull request #8 from dnicolson/fix-tvos-navigation
Fix tvOS navigation
This commit is contained in:
commit
41fa110a26
1 changed files with 21 additions and 21 deletions
|
@ -413,11 +413,6 @@ BOOL settingsMenuSelected = NO;
|
|||
*/
|
||||
- (void) ShowPlayBanner {
|
||||
|
||||
[ mPlayButton setEnabled: NO ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
|
||||
[ mPlaySubMenu Show ];
|
||||
[ mSettingsSubMenu Hide ];
|
||||
[ mExtrasSubMenu Hide ];
|
||||
|
@ -430,6 +425,11 @@ BOOL settingsMenuSelected = NO;
|
|||
aboutMenuSelected = NO;
|
||||
[self setNeedsFocusUpdate];
|
||||
[self updateFocusIfNeeded];
|
||||
#else
|
||||
[ mPlayButton setEnabled: NO ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
#endif
|
||||
|
||||
}
|
||||
|
@ -441,11 +441,6 @@ BOOL settingsMenuSelected = NO;
|
|||
*/
|
||||
- (void) ShowSettingsBanner {
|
||||
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: NO ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
|
||||
[ mSettingsSubMenu Show ];
|
||||
[ mPlaySubMenu Hide ];
|
||||
[ mExtrasSubMenu Hide ];
|
||||
|
@ -458,7 +453,13 @@ BOOL settingsMenuSelected = NO;
|
|||
aboutMenuSelected = NO;
|
||||
[self setNeedsFocusUpdate];
|
||||
[self updateFocusIfNeeded];
|
||||
#else
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: NO ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -468,11 +469,6 @@ BOOL settingsMenuSelected = NO;
|
|||
*/
|
||||
- (void) ShowAboutBanner {
|
||||
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: NO ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
|
||||
[ mAboutSubMenu Show ];
|
||||
[ mPlaySubMenu Hide ];
|
||||
[ mSettingsSubMenu Hide ];
|
||||
|
@ -485,6 +481,11 @@ BOOL settingsMenuSelected = NO;
|
|||
aboutMenuSelected = YES;
|
||||
[self setNeedsFocusUpdate];
|
||||
[self updateFocusIfNeeded];
|
||||
#else
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: NO ];
|
||||
[ mExtrasButton setEnabled: YES ];
|
||||
#endif
|
||||
|
||||
}
|
||||
|
@ -505,17 +506,11 @@ BOOL settingsMenuSelected = NO;
|
|||
//
|
||||
// Sound_StartLocalSound( "iphone/baborted_01.wav" );
|
||||
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: NO ];
|
||||
|
||||
[ mSettingsSubMenu Hide ];
|
||||
[ mPlaySubMenu Hide ];
|
||||
[ mExtrasSubMenu Show ];
|
||||
[ mAboutSubMenu Hide ];
|
||||
|
||||
|
||||
#if TARGET_OS_TV
|
||||
playMenuSelected = NO;
|
||||
extrasMenuSelected = YES;
|
||||
|
@ -523,6 +518,11 @@ BOOL settingsMenuSelected = NO;
|
|||
aboutMenuSelected = NO;
|
||||
[self setNeedsFocusUpdate];
|
||||
[self updateFocusIfNeeded];
|
||||
#else
|
||||
[ mPlayButton setEnabled: YES ];
|
||||
[ mSettingsButton setEnabled: YES ];
|
||||
[ mAboutButton setEnabled: YES ];
|
||||
[ mExtrasButton setEnabled: NO ];
|
||||
#endif
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue