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

Use standard color macros for button code

Browse source 
Since we can now specify alpha in the standard ones, there's no need for the duplicates.
This commit is contained in:
Charles Dang 2017-03-27 20:40:55 +11:00
parent 18e29731e6
commit 6bb7bd1017
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,12 +3,6 @@
### Definition of the default button.
###
#define _GUI_BORDER_COLOR_ALPHA ALPHA
"162, 127, 68, {ALPHA}" #enddef
#define _GUI_BORDER_COLOR_DARK_ALPHA ALPHA
"114, 79, 46, {ALPHA}" #enddef
#define _GUI_BUTTON_FONT_SIZE
16 #enddef
@ -101,8 +95,8 @@
[draw]
{_GUI_STATE "background"
({_GUI_BORDER_COLOR_ALPHA {ALPHA}})
({_GUI_BORDER_COLOR_DARK_ALPHA {ALPHA}}) ("21, 79, 109, 255") {IPF}}
({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})}
@ -115,7 +109,7 @@
[draw]
{_GUI_STATE "background"
("128, 128, 128, {ALPHA}") # Same as GUI__FONT_COLOR_DISABLED__DEFAULT, but with an alpha componant
({GUI__FONT_COLOR_DISABLED__DEFAULT ALPHA={ALPHA}})
("89, 89, 89, {ALPHA}")
("1, 10, 16, 255") "~GS(){IPF}"}
@ -130,8 +124,8 @@
[draw]
{_GUI_STATE "background-pressed"
({_GUI_BORDER_COLOR_ALPHA {ALPHA}})
({_GUI_BORDER_COLOR_DARK_ALPHA {ALPHA}}) ("1, 10, 16, 255") {IPF}}
({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})}
@ -144,8 +138,8 @@
[draw]
{_GUI_STATE "background-active"
({_GUI_BORDER_COLOR_ALPHA {ALPHA}})
({_GUI_BORDER_COLOR_DARK_ALPHA {ALPHA}}) ("12, 108, 157, 255") {IPF}}
({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})}
@ -192,8 +186,6 @@
[/button_definition]
#undef _GUI_BORDER_COLOR_ALPHA
#undef _GUI_BORDER_COLOR_DARK_ALPHA
#undef _GUI_POINT
#undef _GUI_LINE
#undef _GUI_STATE