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

MP Create: Fix a few issues on 800x600 layout

Browse source
This commit is contained in:
Celtic Minstrel 2016-08-24 14:50:40 -04:00
parent d6d62f04b8
commit 2cad49162d
5 changed files with 73 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -534,7 +534,7 @@
[/row]
#enddef
#define _GUI_MP_CREATE_SETTING_PANEL
#define _GUI_MP_CREATE_MAP_SETTINGS
[row]
grow_factor = 0
@ -651,17 +651,9 @@
[/column]
[/row]
#enddef
[row]
grow_factor = 1
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
#define _GUI_MP_CREATE_TIME_LIMIT
[row]
grow_factor = 0
@ -684,7 +676,7 @@
[/row]
[row]
grow_factor = 1
grow_factor = 0
[column]
grow_factor = 1
@ -715,7 +707,6 @@
horizontal_grow = "true"
[spacer]
id = "random_start_time"
width = "(if(screen_width > 1280, (screen_width / 2.4), 0))"
[/spacer]
@ -1220,7 +1211,8 @@
#undef _GUI_MP_CREATE_OPTION_SLIDER
#undef _GUI_MP_CREATE_GENERAL_PANEL
#undef _GUI_MP_CREATE_OPTIONS_PANEL
#undef _GUI_MP_CREATE_SETTING_PANEL
#undef _GUI_MP_CREATE_MAP_SETTINGS
#undef _GUI_MP_CREATE_TIME_LIMIT
#undef _GUI_MP_CREATE_TAB_BAR
#undef _GUI_MP_CREATE_TAB_PADDING
#undef _GUI_MP_CREATE_ALIGN_SPACER

14
data/gui/window/mp_create_game/default_resolution.cfg
View file

@ -317,7 +317,19 @@
[/layer]
[layer]
{_GUI_MP_CREATE_SETTING_PANEL}
{_GUI_MP_CREATE_MAP_SETTINGS}
[row]
grow_factor = 1
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
{_GUI_MP_CREATE_TIME_LIMIT}
[/layer]
[/stack]

14
data/gui/window/mp_create_game/small_resolution.cfg
View file

@ -285,7 +285,19 @@
[/layer]
[layer]
{_GUI_MP_CREATE_SETTING_PANEL}
{_GUI_MP_CREATE_MAP_SETTINGS}
[row]
grow_factor = 1
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
{_GUI_MP_CREATE_TIME_LIMIT}
[/layer]
[/stack]

40
data/gui/window/mp_create_game/tiny_resolution.cfg
View file

@ -9,6 +9,7 @@
[linked_group]
id = "tabs"
fixed_width = "true"
fixed_height = "true"
[/linked_group]
[linked_group]
@ -232,6 +233,7 @@
[layer]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
@ -239,7 +241,14 @@
{_GUI_MP_CREATE_SHUFFLE_TOGGLE}
{_GUI_MP_CREATE_OBSERVER_TOGGLE}
[/row]
[/grid]
[/column]
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
{_GUI_MP_CREATE_SYNC_TOGGLE}
@ -248,7 +257,36 @@
[/column]
[/row]
{_GUI_MP_CREATE_SETTING_PANEL}
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_MAP_SETTINGS}
[/grid]
[/column]
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_TIME_LIMIT}
[/grid]
[/column]
[/row]
# This ensures the above rows don't expand
# to fill the available space.
[row]
grow_factor = 1
[column]
[spacer][/spacer]
[/column]
[column]
[spacer][/spacer]
[/column]
[/row]
[/layer]
[/stack]
[/stacked_widget]

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

@ -861,6 +861,8 @@ void tmp_create_game::dialog_exit_hook(twindow& window) {
void tmp_create_game::post_show(twindow& window)
{
// Show all tabs so that find_widget works correctly
find_widget<tstacked_widget>(&window, "pager", false).select_layer(-1);
if(get_retval() == twindow::OK) {
preferences::set_modifications(create_engine_.active_mods());
preferences::set_level_type(create_engine_.current_level_type().v);