Merge pull request #3678 from thedax/win32UIOverhaul

Win32: Disable the Pause/Run/Reset buttons appropriately when More Settings/Control Mapping are selected.
This commit is contained in:
Henrik Rydgård 2013-09-07 15:25:24 -07:00
commit 123416bafb

View File

@ -467,6 +467,8 @@ namespace MainWindow
TranslateMenuItem(ID_OPTIONS_READFBOTOMEMORYGPU, desktopUI, true, false);
TranslateMenuItem(ID_OPTIONS_FRAMESKIP_0, desktopUI);
TranslateMenuItem(ID_OPTIONS_FRAMESKIP_AUTO, desktopUI);
TranslateMenuItem(ID_OPTIONS_MORE_SETTINGS, desktopUI);
TranslateMenuItem(ID_OPTIONS_CONTROLS, desktopUI);
// Skip frameskipping 2-8..
TranslateMenuItem(ID_OPTIONS_TEXTUREFILTERING_AUTO, desktopUI);
TranslateMenuItem(ID_OPTIONS_NEARESTFILTERING, desktopUI);
@ -1356,10 +1358,12 @@ namespace MainWindow
case ID_OPTIONS_CONTROLS:
NativeMessageReceived("control mapping", "");
globalUIState = UISTATE_MENU;
break;
case ID_OPTIONS_MORE_SETTINGS:
NativeMessageReceived("settings", "");
globalUIState = UISTATE_MENU;
break;
case ID_EMULATION_SOUND: