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

GUI2/Canvas: removed [line] alpha= key in favor of evaluating color as a formula

Browse source
This commit is contained in:
Charles Dang 2017-04-09 22:04:11 +11:00
parent 53adf0ba1a
commit 8ed11e7506
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/schema.cfg
View file

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

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

@ -67,7 +67,7 @@
y2 = "(text_y_offset + text_font_height - 2)"
color = "255, 255, 255, 255"
# TODO: disabled until there's a way to deal with textboxes on multiple windows
#alpha = "(cursor_alpha)"
#color = "([255, 255, 255, cursor_alpha])"
thickness = 1
[/line]
#enddef

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

@ -282,11 +282,10 @@ private:
typed_formula<unsigned> x1_, /**< The start x coordinate of the line. */
y1_, /**< The start y coordinate of the line. */
x2_, /**< The end x coordinate of the line. */
y2_, /**< The end y coordinate of the line. */
alpha_; /**< Alpha value override computed as a formula. */
y2_; /**< The end y coordinate of the line. */
/** The color of the line. */
color_t color_;
typed_formula<color_t> color_;
/**
* The thickness of the line.
@ -620,8 +619,7 @@ line_shape::line_shape(const config& cfg)
, y1_(cfg["y1"])
, x2_(cfg["x2"])
, y2_(cfg["y2"])
, alpha_(cfg["alpha"])
, color_(decode_color(cfg["color"]))
, color_(cfg["color"])
, thickness_(cfg["thickness"])
{
const std::string& debug = (cfg["debug"]);
@ -644,12 +642,6 @@ void line_shape::draw(surface& canvas,
const unsigned y1 = y1_(variables);
const unsigned x2 = x2_(variables);
const unsigned y2 = y2_(variables);
const unsigned alpha = alpha_(variables);
// Override alpha from color with formula.
if(alpha_.has_formula()) {
color_.a = alpha;
}
DBG_GUI_D << "Line: draw from " << x1 << ',' << y1 << " to " << x2 << ','
<< y2 << " canvas size " << canvas->w << ',' << canvas->h
@ -666,7 +658,7 @@ void line_shape::draw(surface& canvas,
// lock the surface
surface_lock locker(canvas);
draw_line(canvas, renderer, color_, x1, y1, x2, y2);
draw_line(canvas, renderer, color_(variables), x1, y1, x2, y2);
}
/***** ***** ***** ***** ***** Rectangle ***** ***** ***** ***** *****/