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

Loading Screen: removed hardcoded padding dimensions

Browse source 
Credit to @shikadiqueen for the idea. This fixes potential crashes if the padding can't fit on certain resolutions.
Also keeps the vertical spread consistent between resolutions (no more < 800 height handling).
This commit is contained in:
Charles Dang 2019-11-05 22:57:02 +11:00
parent 15bf3bb256
commit a6ec345fc8
1 changed files with 90 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
data/gui/window/loadscreen.cfg
View file

@ -39,20 +39,6 @@
[/window_definition]
#define _GUI_PADDING
[row]
[column]
[spacer]
height = "((screen_height - if(screen_height < 800, 200, 0)) / 3)"
[/spacer]
[/column]
[/row]
#enddef
[window]
id = "loading_screen"
description = "Loadscreen."
@ -72,94 +58,107 @@
[grid]
{_GUI_PADDING}
[row]
grow_factor = 2
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
vertical_alignment = "center"
[image]
definition = "logo"
label = "misc/logo-bg.png"
[/image]
# Use a child grid so elements are centered
[grid]
[row]
grow_factor = 2
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
vertical_alignment = "center"
[image]
definition = "logo"
label = "misc/logo-bg.png"
[/image]
[/column]
[/row]
{GUI_FILLER_ROW HEIGHT=30}
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
vertical_alignment = "center"
[image]
definition = "decoration"
label = "misc/loadscreen_decor.png"
[/image]
[/column]
[/row]
{GUI_FILLER_ROW HEIGHT=30}
[row]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
vertical_alignment = "center"
[label]
text_alignment = "center"
definition = "default_large"
id = "test_animation"
label = " "
[/label]
[/column]
[/row]
{GUI_FILLER_ROW HEIGHT=30}
[row]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
vertical_alignment = "center"
[label]
text_alignment = "center"
definition = "default_large"
id = "status"
label = _ "Loading..."
[/label]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
vertical_alignment = "center"
[image]
definition = "decoration"
label = "misc/loadscreen_decor.png"
[/image]
[/column]
[/row]
[row]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
vertical_alignment = "center"
[label]
text_alignment = "center"
definition = "default_large"
id = "test_animation"
label = " "
[/label]
[/column]
[/row]
[row]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
vertical_alignment = "center"
[label]
text_alignment = "center"
definition = "default_large"
id = "status"
label = _ "Loading..."
[/label]
[/column]
[/row]
{_GUI_PADDING}
[/grid]
[/resolution]
[/window]
#undef _GUI_PADDING