upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 20:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP Create: Fix incorrectly selecting menu option current value

Browse Source
This commit is contained in:
Celtic Minstrel 2016-08-22 16:27:35 -04:00
parent 3c84f98808
commit af80ddbb2c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/dialogs/multiplayer/mp_create_game.cpp
View File

@ -505,7 +505,8 @@ void tmp_create_game::display_custom_options(twindow& window, ttree_view& tree,
std::vector<config> combo_items;
std::vector<std::string> combo_values;
for(auto item : combobox_option.child_range("item")) {
config::const_child_itors items = combobox_option.child_range("item");
for(auto item : items) {
// Comboboxes expect this key to be 'label' not 'name'
item["label"] = item["name"];
@ -531,7 +532,15 @@ void tmp_create_game::display_custom_options(twindow& window, ttree_view& tree,
combobox->set_id(widget_id);
combobox->set_values(combo_items);
combobox->set_selected(data_map[widget_id].to_int());
config::attribute_value val = data_map[widget_id];
auto iter = std::find_if(items.begin(), items.end(), [&val](const config& cfg) {
return cfg["value"] == val;
});
if(iter != items.end()) {
combobox->set_selected(iter - items.begin());
}
combobox->connect_click_handler(
std::bind(&tmp_create_game::update_options_data_map<tcombobox>, this, combobox, visible_options_.back()));
}