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

Add a special label for the scroll_label.

Browse source 
The old label was always centred which looked bad if the label is larger
as needed, now it's always starting on top.
This commit is contained in:
Mark de Wever 2009-11-14 19:49:23 +00:00
parent e53fb069cc
commit a90d22b94b
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data/gui/default/widget/label_default.cfg
View file

@ -6,7 +6,7 @@
### - default, the one for general usage.
### - title, for titles in dialogs.
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED Y_POSITION
[resolution]
{RESOLUTION}
@ -29,7 +29,7 @@
[text]
x = 0
y = {GUI__TEXT_VERTICALLY_CENTRED}
y = {Y_POSITION}
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
@ -50,7 +50,7 @@
[text]
x = 0
y = {GUI__TEXT_VERTICALLY_CENTRED}
y = {Y_POSITION}
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
@ -68,7 +68,7 @@
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOUR
#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOUR Y_POSITION
[label_definition]
id = {ID}
description = {DESCRIPTION}
@ -79,6 +79,7 @@
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
({Y_POSITION})
}
@ -88,15 +89,17 @@
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
({Y_POSITION})
}
[/label_definition]
#enddef
{_GUI_DEFINITION "default" "default label" DEFAULT () DEFAULT }
{_GUI_DEFINITION "title" "label used for titles" TITLE "bold" TITLE }
{_GUI_DEFINITION "default_small" "default, small font size" SMALL () DEFAULT }
{_GUI_DEFINITION "default_tiny" "default, small font size" TINY () DEFAULT }
{_GUI_DEFINITION "default" "default label" DEFAULT () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "scroll_label" "scroll label" DEFAULT () DEFAULT 0}
{_GUI_DEFINITION "title" "label used for titles" TITLE "bold" TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_small" "default, small font size" SMALL () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_tiny" "default, small font size" TINY () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/scroll_label_default.cfg
View file

@ -55,7 +55,7 @@
[label]
id = "_label"
definition = "default"
definition = "scroll_label"
[/label]
[/column]