Skip to content

Commit

Permalink
tlabel: align text to top of available space
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@Vultraz
Vultraz committed Mar 6, 2016
1 parent eeff372 commit 9d7a55d
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions data/gui/default/widget/label_default.cfg
View file
Expand Up @@ -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}
Expand All @@ -33,7 +33,7 @@

[text]
x = 0
y = {Y_POSITION}
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
Expand All @@ -58,7 +58,7 @@

[text]
x = 0
y = {Y_POSITION}
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
Expand All @@ -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}
Expand All @@ -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 "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 "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 }
{_GUI_DEFINITION "scroll_label_small" "scroll label, small font size" () SMALL () DEFAULT }

#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

0 comments on commit 9d7a55d

Please sign in to comment.