0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support for submenues which are associated with a hotkey action.

Browse source
This commit is contained in:
fendrin 2014-06-09 16:24:25 +02:00
parent efec080348
commit 11a7b22381
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/hotkey/command_executor.cpp
View file

@ -419,21 +419,26 @@ std::vector<std::string> command_executor::get_menu_images(display& disp, const
str << IMAGE_PREFIX << img << COLUMN_SEPARATOR;
}
const theme::menu* menu = disp.get_theme().get_menu_item(item);
if (hk == hotkey::HOTKEY_NULL) {
const theme::menu* menu = disp.get_theme().get_menu_item(item);
if (menu)
str << menu->title();
else
str << item.substr(0, item.find_last_not_of(' ') + 1) << COLUMN_SEPARATOR;
} else {
std::string desc = hotkey::get_description(item);
if (hk == HOTKEY_ENDTURN) {
const theme::action *b = disp.get_theme().get_action_item("button-endturn");
if (b) {
desc = b->title();
if (menu)
str << menu->title();
else {
std::string desc = hotkey::get_description(item);
if (hk == HOTKEY_ENDTURN) {
const theme::action *b = disp.get_theme().get_action_item("button-endturn");
if (b) {
desc = b->title();
}
}
str << desc << COLUMN_SEPARATOR << hotkey::get_names(item);
}
str << desc << COLUMN_SEPARATOR << hotkey::get_names(item);
}
result.push_back(str.str());