upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 16:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP Create Game: replaced a hack with a proper solution

Browse Source
This commit is contained in:
Charles Dang 2017-11-16 10:59:04 +11:00
parent 0d166750ec
commit c7ff94f434
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,11 @@ void mp_create_game::pre_show(window& win)
connect_signal_notify_modified(tab_bar, connect_signal_notify_modified(tab_bar,
std::bind(&mp_create_game::on_tab_select, this, std::ref(win))); std::bind(&mp_create_game::on_tab_select, this, std::ref(win)));
// Allow the settings stack to find widgets in all pages, regardless of which is selected.
// This ensures settings (especially game settings) widgets are appropriately updated when
// a new game is selected, regardless of which settings tab is active at the time.
find_widget<stacked_widget>(&win, "pager", false).set_find_in_all_layers(true);
// We call on_tab_select farther down. // We call on_tab_select farther down.
// //
@ -520,22 +525,6 @@ void mp_create_game::on_tab_select(window& window)
{ {
const int i = find_widget<listbox>(&window, "tab_bar", false).get_selected_row(); const int i = find_widget<listbox>(&window, "tab_bar", false).get_selected_row();
find_widget<stacked_widget>(&window, "pager", false).select_layer(i); find_widget<stacked_widget>(&window, "pager", false).select_layer(i);
/* HACK: the GUI2 field functions always internally save the correct value when set_widget_value is called
* - ie, when on_game_select calls update_map_settings, the correct values will be stored in the field,
* but if the settings tab isn't selected the widgets will not display the correct values. This forces
* an update when we switch to that tab so the widgets correctly display their values.
*
* A possible better fix would be storing a pointer to the widget in question in the field object. It
* seems widgets will still correctly update even if they are not on the currently selected page if a
* pointer already exists.
*
* Another possible fix would be allowing stacked_widget to return widgets on any page, not just on the
* currently visible one.
*/
if(i == TAB_SETTINGS) {
update_map_settings(window);
}
} }
void mp_create_game::on_mod_toggle(window& window, const int index, toggle_button* sender) void mp_create_game::on_mod_toggle(window& window, const int index, toggle_button* sender)