diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index c3ec9f6a7f..1cdaafd629 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -93,7 +93,7 @@ namespace MainWindow { static void EmptySubMenu(HMENU menu) { int c = GetMenuItemCount(menu); for (int i = 0; i < c; ++i) { - RemoveMenu(menu, i, MF_BYPOSITION); + RemoveMenu(menu, 0, MF_BYPOSITION); } } @@ -146,11 +146,11 @@ namespace MainWindow { const std::wstring enable = ConvertUTF8ToWString(des->T("Enable")); const std::wstring hide = ConvertUTF8ToWString(des->T("Hide from main menu")); - // Simply remove the old help menu and create a new one. - RemoveMenu(menu, ID_SIMPLEUI_MENU, MF_BYPOSITION); - HMENU simpleUImenu = CreatePopupMenu(); - InsertMenu(menu, ID_SIMPLEUI_MENU, MF_POPUP | MF_STRING | MF_BYPOSITION, (UINT_PTR)simpleUImenu, simpleUI.c_str()); + HMENU simpleUImenu = GetSubmenuById(menu, ID_SIMPLEUI_MENU); + EmptySubMenu(simpleUImenu); + + //InsertMenu(menu, ID_SIMPLEUI_MENU, MF_POPUP | MF_STRING | MF_BYPOSITION, (UINT_PTR)simpleUImenu, simpleUI.c_str()); AppendMenu(simpleUImenu, MF_STRING | MF_BYCOMMAND, ID_SIMPLEUI_TOGGLE, enable.c_str()); AppendMenu(simpleUImenu, MF_STRING | MF_BYCOMMAND, ID_SIMPLEUI_HIDE, hide.c_str()); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 90704106d7..7a9291aca7 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -660,6 +660,10 @@ BEGIN BEGIN MENUITEM "", 0, MFT_SEPARATOR END + POPUP "Simple UI", ID_SIMPLEUI_MENU + BEGIN + MENUITEM "", 0, MFT_SEPARATOR + END END IDR_POPUPMENUS MENU diff --git a/Windows/resource.h b/Windows/resource.h index e0fd0428ef..6a026c1ad6 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -342,9 +342,6 @@ #define ID_OPTIONS_WINDOW8X 40174 #define ID_OPTIONS_WINDOW9X 40175 #define ID_OPTIONS_WINDOW10X 40176 -#define ID_GEDBG_REPLACEMENT_FILENAME 40199 -#define ID_SIMPLEUI_TOGGLE 40200 -#define ID_SIMPLEUI_HIDE 40201 #define ID_EMULATION_PAUSE 40177 #define ID_TEXTURESCALING_REALTIME 40178 #define ID_TEXTURESCALING_REALTIME_HC 40179 @@ -362,23 +359,26 @@ #define ID_OPTIONS_MENU 40191 #define ID_HELP_MENU 40192 #define ID_SIMPLEUI_MENU 40193 -#define ID_FILE_SAVESTATE_SLOT_MENU 40194 -#define ID_FILE_RECORD_MENU 40195 -#define ID_EMULATION_ROTATION_MENU 40196 -#define ID_OPTIONS_SCREEN_MENU 40197 -#define ID_OPTIONS_WINDOW_MENU 40198 -#define ID_OPTIONS_BACKEND_MENU 40199 -#define ID_OPTIONS_RENDERMODE_MENU 40200 -#define ID_OPTIONS_FRAMESKIP_MENU 40201 -#define ID_OPTIONS_FRAMESKIPTYPE_MENU 40202 -#define ID_OPTIONS_TEXTUREFILTERING_MENU 40203 -#define ID_OPTIONS_SCREENFILTER_MENU 40204 -#define ID_OPTIONS_TEXTURESCALING_MENU 40205 -#define IDC_GEDBG_STEPCOUNT 40206 -#define IDC_GEDBG_STEPCOUNT_DEC 40207 -#define IDC_GEDBG_STEPCOUNT_INC 40208 -#define IDC_GEDBG_STEPCOUNT_JUMP 40209 -#define IDC_GEDBG_STEPCOUNT_COMBO 40210 +#define ID_GEDBG_REPLACEMENT_FILENAME 40194 +#define ID_SIMPLEUI_TOGGLE 40195 +#define ID_SIMPLEUI_HIDE 40196 +#define ID_FILE_SAVESTATE_SLOT_MENU 40197 +#define ID_FILE_RECORD_MENU 40198 +#define ID_EMULATION_ROTATION_MENU 40199 +#define ID_OPTIONS_SCREEN_MENU 40200 +#define ID_OPTIONS_WINDOW_MENU 40201 +#define ID_OPTIONS_BACKEND_MENU 40202 +#define ID_OPTIONS_RENDERMODE_MENU 40203 +#define ID_OPTIONS_FRAMESKIP_MENU 40204 +#define ID_OPTIONS_FRAMESKIPTYPE_MENU 40205 +#define ID_OPTIONS_TEXTUREFILTERING_MENU 40206 +#define ID_OPTIONS_SCREENFILTER_MENU 40207 +#define ID_OPTIONS_TEXTURESCALING_MENU 40208 +#define IDC_GEDBG_STEPCOUNT 40209 +#define IDC_GEDBG_STEPCOUNT_DEC 40210 +#define IDC_GEDBG_STEPCOUNT_INC 40211 +#define IDC_GEDBG_STEPCOUNT_JUMP 40212 +#define IDC_GEDBG_STEPCOUNT_COMBO 40213 // Dummy option to let the buffered rendering hotkey cycle through all the options. #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 @@ -391,7 +391,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 256 -#define _APS_NEXT_COMMAND_VALUE 40211 +#define _APS_NEXT_COMMAND_VALUE 40214 #define _APS_NEXT_CONTROL_VALUE 1202 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/assets/lang b/assets/lang index f97aa5d000..86c62b9a23 160000 --- a/assets/lang +++ b/assets/lang @@ -1 +1 @@ -Subproject commit f97aa5d000b0a27e27b88b0072ccf932de506eae +Subproject commit 86c62b9a23936d556ea0899673f7b078a2f12224