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

Remove unnecessary workaround

Browse source
This commit is contained in:
Gunter Labes 2024-04-26 23:33:19 +02:00
parent b14ff85b0c
commit 2099c23e54
No known key found for this signature in database
GPG key ID: C0C7B971CC910216
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/gui/widget/multiline_text_default.cfg
View file

@ -54,7 +54,7 @@
font_family = {FONT_FAMILY}
color = "(if(editable=1, active_color, inactive_color) where
active_color = [{COLOR}],
inactive_color = [{__DISABLED_COLOR_PREPROCESSOR_WORKAROUND}]
inactive_color = ["{GUI__FONT_COLOR_DISABLED__DEFAULT}"]
)"
text = "(text)"
highlight_color = "21, 53, 80"
@ -63,16 +63,6 @@
[/text]
#enddef
#
# The preprocessor can't process GUI__FONT_COLOR_DISABLED__DEFAULT as part of string
# concatenation for some reason. Perhaps it's the optional argument. So I'm just copying
# it here. Though the lack of quotes means I don't need to use concatenation anyway.
#
# -- vultraz, 2018-03-26
#
#define __DISABLED_COLOR_PREPROCESSOR_WORKAROUND
128, 128, 128, 255 #enddef
#define _GUI_DRAW_TEXT_OR_HINT SIZE COLOR
#arg FONT_FAMILY
#endarg
@ -102,7 +92,7 @@
color = "(
if((text = '' and hint_text != '') or editable = 0, hint_color, reg_color) where
hint_color = [{__DISABLED_COLOR_PREPROCESSOR_WORKAROUND}],
hint_color = ["{GUI__FONT_COLOR_DISABLED__DEFAULT}"],
reg_color = [{COLOR}]
)"
@ -255,4 +245,3 @@
#undef _GUI_DRAW_TEXT_OR_HINT
#undef _GUI_TEXTBOX_BACKGROUND_ENABLED
#undef _GUI_TEXTBOX_BACKGROUND_DISABLED
#undef __DISABLED_COLOR_PREPROCESSOR_WORKAROUND

13
data/gui/widget/text_box_default.cfg
View file

@ -62,16 +62,6 @@
[/text]
#enddef
#
# The preprocessor can't process GUI__FONT_COLOR_DISABLED__DEFAULT as part of string
# concatenation for some reason. Perhaps it's the optional argument. So I'm just copying
# it here. Though the lack of quotes means I don't need to use concatenation anyway.
#
# -- vultraz, 2018-03-26
#
#define __DISABLED_COLOR_PREPROCESSOR_WORKAROUND
128, 128, 128, 255 #enddef
#define _GUI_DRAW_TEXT_OR_HINT SIZE COLOR
#arg FONT_FAMILY
#endarg
@ -101,7 +91,7 @@
color = "(
if(text = '' and hint_text != '', hint_color, reg_color) where
hint_color = [{__DISABLED_COLOR_PREPROCESSOR_WORKAROUND}],
hint_color = [{GUI__FONT_COLOR_DISABLED__DEFAULT}],
reg_color = [{COLOR}]
)"
@ -254,4 +244,3 @@
#undef _GUI_DRAW_BACKGROUND
#undef _GUI_TEXTBOX_BACKGROUND_ENABLED
#undef _GUI_TEXTBOX_BACKGROUND_DISABLED
#undef __DISABLED_COLOR_PREPROCESSOR_WORKAROUND