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

tlabel: align text to top of available space

Browse source 
In most cases, the widget size is the size of the text and looks no different
with this change. However, in cases where the label widget area is larger than
the text (such as in Unit Create), it resulted in text being rendered in the
middle of the available space, which looked weird.
This commit is contained in:
Charles Dang 2016-03-07 00:54:41 +11:00
parent eeff37237f
commit 9d7a55d433
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
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_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION
#define _GUI_RESOLUTION RESOLUTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED
[resolution]
{RESOLUTION}
@ -33,7 +33,7 @@
[text]
x = 0
y = {Y_POSITION}
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
@ -58,7 +58,7 @@
[text]
x = 0
y = {Y_POSITION}
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
@ -80,7 +80,7 @@
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR Y_POSITION
#define _GUI_DEFINITION ID DESCRIPTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR
[label_definition]
id = {ID}
description = {DESCRIPTION}
@ -92,23 +92,22 @@
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}})
({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}})
({Y_POSITION})
}
[/label_definition]
#enddef
{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "scroll_label" "scroll label" () DEFAULT () DEFAULT 0}
{_GUI_DEFINITION "title" "label used for titles" () TITLE () TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT ({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})}
{_GUI_DEFINITION "gold_small" "small gold label" () SMALL () TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT }
{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT }
{_GUI_DEFINITION "scroll_label" "scroll label" () DEFAULT () DEFAULT }
{_GUI_DEFINITION "title" "label used for titles" () TITLE () TITLE }
{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT }
{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT }
{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT }
{_GUI_DEFINITION "gold_small" "small gold label" () SMALL () TITLE }
{_GUI_DEFINITION "scroll_label_mono" "fixed width scroll label" monospace DEFAULT () DEFAULT 0}
{_GUI_DEFINITION "scroll_label_small" "scroll label, small font size" () SMALL () DEFAULT 0}
{_GUI_DEFINITION "scroll_label_mono" "fixed width scroll label" monospace DEFAULT () DEFAULT }
{_GUI_DEFINITION "scroll_label_small" "scroll label, small font size" () SMALL () DEFAULT }
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION