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

GUI2/Button: restored vertically-offset text positioning

Browse source 
The "plain" centered text looks a little weird with buttons
This commit is contained in:
Charles Dang 2020-12-14 23:51:16 +11:00
parent 4f5a713934
commit 24c8c3bd01
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
data/gui/widget/button_default.cfg
View file

@ -6,6 +6,21 @@
#define _GUI_BUTTON_FONT_SIZE
16 #enddef
# Same as GUI__CENTERED_TEXT but with a slight vertical offset for the text to make it look better
#define _GUI_BUTTON_TEXT FONT_SIZE FONT_STYLE FONT_COLOR
[text]
x = {GUI__TEXT_HORIZONTALLY_CENTRED}
y = "(max((height - text_height - 2) / 2, 0))"
w = "(text_width)"
h = "(text_height)"
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = {FONT_COLOR}
text = "(text)"
text_markup = "(text_markup)"
[/text]
#enddef
#define _GUI_LINE X1 Y1 X2 Y2 COLOR
[line]
x1 = {X1}
@ -98,7 +113,7 @@
({GUI__BORDER_COLOR ALPHA={ALPHA}})
({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("21, 79, 109, 255") {IPF}}
{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
[/draw]
@ -113,7 +128,7 @@
("89, 89, 89, {ALPHA}")
("60, 60, 60, 255") "~GS(){IPF}"}
{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}
[/draw]
@ -127,7 +142,7 @@
({GUI__BORDER_COLOR ALPHA={ALPHA}})
({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("1, 10, 16, 255") {IPF}}
{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
[/draw]
@ -141,7 +156,7 @@
({GUI__BORDER_COLOR ALPHA={ALPHA}})
({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("12, 108, 157, 255") {IPF}}
{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
[/draw]
@ -314,6 +329,7 @@
[/button_definition]
#undef _GUI_BUTTON_TEXT
#undef _GUI_POINT
#undef _GUI_LINE
#undef _GUI_STATE