upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 17:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixup to 5efc6a807f06

Browse Source 
Forgot that using a static lambda w/ name capture wouldn't work since 'name' is different every draw.
This commit is contained in:
Charles Dang 2017-04-06 09:43:39 +11:00
parent 5efc6a807f
commit 0fe6c32951
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/core/canvas.cpp
View File

@ -936,6 +936,8 @@ private:
// TODO: use a typed_formula?
wfl::formula actions_formula_;
static void dimension_validation(unsigned value, const std::string& name, const std::string& key);
};
/*WIKI
@ -1014,6 +1016,15 @@ image_shape::image_shape(const config& cfg, wfl::action_function_symbol_table& f
}
}
void image_shape::dimension_validation(unsigned value, const std::string& name, const std::string& key)
{
const int as_int = static_cast<int>(value);
VALIDATE_WITH_DEV_MESSAGE(as_int >= 0, _("Image doesn't fit on canvas."),
formatter() << "Image '" << name << "', " << key << " = " << as_int << "."
);
}
void image_shape::draw(surface& canvas,
SDL_Renderer* /*renderer*/,
wfl::map_formula_callable& variables)
@ -1039,8 +1050,7 @@ void image_shape::draw(surface& canvas,
surface tmp(image::get_image(image::locator(name)));
if(!tmp) {
ERR_GUI_D << "Image: '" << name << "' not found and won't be drawn."
<< std::endl;
ERR_GUI_D << "Image: '" << name << "' not found and won't be drawn." << std::endl;
return;
}
@ -1052,28 +1062,20 @@ void image_shape::draw(surface& canvas,
local_variables.add("image_original_width", wfl::variant(image_->w));
local_variables.add("image_original_height", wfl::variant(image_->h));
static auto dimension_validation = [&](unsigned value, const std::string& key) {
const int as_int = static_cast<int>(value);
VALIDATE_WITH_DEV_MESSAGE(as_int >= 0, _("Image doesn't fit on canvas."),
formatter() << "Image '" << name << "', " << key << " = " << as_int << "."
);
};
unsigned w = w_(local_variables);
dimension_validation(w, "w");
dimension_validation(w, name, "w");
unsigned h = h_(local_variables);
dimension_validation(h, "h");
dimension_validation(h, name, "h");
local_variables.add("image_width", wfl::variant(w ? w : image_->w));
local_variables.add("image_height", wfl::variant(h ? h : image_->h));
const unsigned clip_x = x_(local_variables);
dimension_validation(clip_x, "x");
dimension_validation(clip_x, name, "x");
const unsigned clip_y = y_(local_variables);
dimension_validation(clip_y, "y");
dimension_validation(clip_y, name, "y");
local_variables.add("clip_x", wfl::variant(clip_x));
local_variables.add("clip_y", wfl::variant(clip_y));