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

GUI2/Canvas: simplify clear_shapes logic

Browse source 
(cherry-picked from commit 10e43a6642)
This commit is contained in:
Charles Dang 2018-05-15 19:03:56 +11:00
parent 841e5c6b06
commit 64442ea041
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1497,13 +1497,18 @@ void canvas::parse_cfg(const config& cfg)
void canvas::clear_shapes(const bool force)
{
auto conditional = [force](const shape_ptr s)->bool { return !s->immutable() && !force; };
if(force) {
shapes_.clear();
drawn_shapes_.clear();
} else {
auto conditional = [](const shape_ptr s)->bool { return !s->immutable(); };
auto iter = std::remove_if(shapes_.begin(), shapes_.end(), conditional);
shapes_.erase(iter, shapes_.end());
auto iter = std::remove_if(shapes_.begin(), shapes_.end(), conditional);
shapes_.erase(iter, shapes_.end());
iter = std::remove_if(drawn_shapes_.begin(), drawn_shapes_.end(), conditional);
drawn_shapes_.erase(iter, drawn_shapes_.end());
iter = std::remove_if(drawn_shapes_.begin(), drawn_shapes_.end(), conditional);
drawn_shapes_.erase(iter, drawn_shapes_.end());
}
}
void canvas::invalidate_cache()