libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Added possibility to provide action ids in menus in strings

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-12-16 16:40:51 +01:00
parent 2582036ea6
commit 64b148afba
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/macgui/macmenu.cpp
View File

@ -488,9 +488,25 @@ void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
submenu = addSubMenu(nullptr, id);
for (uint i = 0; i < string.size(); i++) {
while(i < string.size() && string[i] != ';') // Read token
while (i < string.size() && string[i] != ';') // Read token
item += string[i++];
if (item.lastChar() == ']') { // we have command id
item.deleteLastChar();
const char *p = strrchr(item.c_str(), '[');
p++;
if (p == NULL) {
error("MacMenu::createSubMenuFromString(): Malformed menu item: '%s', bad format for actionId", item.c_str());
}
commandId = atoi(p);
item = Common::String(item.c_str(), p - 1);
}
if (item == "(-") {
addMenuItem(submenu, NULL, 0);
} else {
@ -504,7 +520,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
item.deleteChar(shortPtr - item.c_str());
item.deleteChar(shortPtr - item.c_str());
} else {
error("Unexpected shortcut: '%s', item '%s' in menu '%s'", shortPtr, item.c_str(), string.c_str());
error("MacMenu::createSubMenuFromString(): Unexpected shortcut: '%s', item '%s' in menu '%s'", shortPtr, item.c_str(), string.c_str());
}
}