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

GUI2/Canvas: evaluate text color as formula

Browse source
This commit is contained in:
Charles Dang 2017-04-09 21:29:40 +11:00
parent 57efa5cf47
commit 10f867bd7e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/schema.cfg
View file

@ -404,7 +404,7 @@
super="generic/shape"
[key]
name="color"
type="color"
type="f_color"
default=""
[/key]
[key]

6
src/gui/core/canvas.cpp
View file

@ -1443,7 +1443,7 @@ private:
typed_formula<PangoAlignment> text_alignment_;
/** The color of the text. */
color_t color_;
typed_formula<color_t> color_;
/** The text to draw. */
typed_formula<t_string> text_;
@ -1529,7 +1529,7 @@ text_shape::text_shape(const config& cfg)
, font_size_(cfg["font_size"])
, font_style_(decode_font_style(cfg["font_style"]))
, text_alignment_(cfg["text_alignment"])
, color_(decode_color(cfg["color"]))
, color_(cfg["color"])
, text_(cfg["text"])
, text_markup_(cfg["text_markup"], false)
, link_aware_(cfg["text_link_aware"], false)
@ -1573,7 +1573,7 @@ void text_shape::draw(surface& canvas,
.set_font_size(font_size_)
.set_font_style(font_style_)
.set_alignment(text_alignment_(variables))
.set_foreground_color(color_)
.set_foreground_color(color_(variables))
.set_maximum_width(maximum_width_(variables))
.set_maximum_height(maximum_height_(variables), true)
.set_ellipse_mode(variables.has_key("text_wrap_mode")