Allow different sizes of the title screen logo.

Small logos are no longer tiled and large ones no longer cut off (at
least not unless they become larger as the maximum 550x250).  (Fixes
bug #16632.)
This commit is contained in:
Mark de Wever 2010-09-29 21:28:26 +00:00
parent cb2ce82cea
commit 2eede1781d
2 changed files with 12 additions and 8 deletions

View file

@ -39,6 +39,7 @@ Version 1.9.1+svn:
* Changed: Improved the layout of the title screen. * Changed: Improved the layout of the title screen.
* Fixed: Changing the language updates map and logo in title screen * Fixed: Changing the language updates map and logo in title screen
(bug #16631). (bug #16631).
* Fixed: No longer cut off large title screen logos (bug #16632).
* WML Engine: * WML Engine:
* id= in SUFs now accepts a comma-separated list * id= in SUFs now accepts a comma-separated list
* [capture_village] now accepts a full SLF * [capture_village] now accepts a full SLF

View file

@ -9,14 +9,16 @@
[resolution] [resolution]
min_width = 440 # This maximum is also documented in the wiki
min_height = 201 # http://wiki.wesnoth.org/ImageLocalization#BfW_Logo
min_width = 550
min_height = 250
default_width = 440 default_width = 550
default_height = 201 default_height = 250
max_width = 440 max_width = 550
max_height = 201 max_height = 250
[state_enabled] [state_enabled]
@ -25,8 +27,9 @@
[image] [image]
# w = 0 means fit # w = 0 means fit
# using percentage = 0 seems to fail for some reason... # using percentage = 0 seems to fail for some reason...
w = "(if(percentage <= 0, 1, (width * percentage) / 100))" x = "((width - image_original_width) / 2)"
h = "(height)" w = "(if(percentage <= 0, 1, (image_original_width * percentage) / 100))"
h = "(image_height)"
name = "misc/logo.png" name = "misc/logo.png"
resize_mode = "tile" resize_mode = "tile"
[/image] [/image]