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

MP Create: fixed some issues with displaying custom options

Browse source
This commit is contained in:
Charles Dang 2016-08-17 22:40:38 +11:00
parent 306fa1744f
commit a99e984f42
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/gui/window/mp_create_game.cfg
View file

@ -337,7 +337,7 @@
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
horizontal_grow = "true"
[toggle_button]
id = "option_checkbox"
@ -419,6 +419,7 @@
[slider]
id = "option_slider"
definition = "default"
step_size = 1
[/slider]
[/column]

33
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -341,9 +341,9 @@ void tmp_create_game::display_custom_options(ttree_view& tree, const config* con
ttree_view_node& option_node = tree.add_node("option_node", data);
data.clear();
for(const auto& checkbox_option : options.child_range("checkbox")) {
data.clear();
item["label"] = checkbox_option["name"];
data.emplace("option_checkbox", item);
@ -357,9 +357,14 @@ void tmp_create_game::display_custom_options(ttree_view& tree, const config* con
//checkbox->set_label(checkbox_option["name"].str());
}
option_node.add_child("options_spacer_node", empty);
// Only add a spacer if there were an option of this type
if(options.has_child("checkbox")) {
option_node.add_child("options_spacer_node", empty);
}
for(const auto& combobox_option : options.child_range("combo")) {
data.clear();
item["label"] = combobox_option["name"];
data.emplace("combobox_label", item);
@ -380,9 +385,14 @@ void tmp_create_game::display_custom_options(ttree_view& tree, const config* con
}
}
option_node.add_child("options_spacer_node", empty);
// Only add a spacer if there were an option of this type
if(options.has_child("combo")) {
option_node.add_child("options_spacer_node", empty);
}
for(const auto& slider_option : options.child_range("slider")) {
data.clear();
item["label"] = slider_option["name"];
data.emplace("slider_label", item);
@ -394,13 +404,18 @@ void tmp_create_game::display_custom_options(ttree_view& tree, const config* con
slider->set_maximum_value(slider_option["max"].to_int());
slider->set_minimum_value(slider_option["min"].to_int());
slider->set_step_size(slider_option["step"].to_int());
slider->set_step_size(slider_option["step"].to_int(1));
slider->set_value(slider_option["default"].to_int());
}
option_node.add_child("options_spacer_node", empty);
// Only add a spacer if there were an option of this type
if(options.has_child("slider")) {
option_node.add_child("options_spacer_node", empty);
}
for(const auto& text_entry_option : options.child_range("entry")) {
data.clear();
item["label"] = text_entry_option["name"];
data.emplace("text_entry_label", item);
@ -413,8 +428,12 @@ void tmp_create_game::display_custom_options(ttree_view& tree, const config* con
textbox->set_value(text_entry_option["default"].str());
}
// Only add a spacer if there were an option of this type
if(options.has_child("entry")) {
option_node.add_child("options_spacer_node", empty);
}
// Add the Defaults button at the end
option_node.add_child("options_spacer_node", empty);
option_node.add_child("options_default_button", empty);
}
}