upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 02:42:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Select Orb Colors: used a widget iterator instead of a walker

Browse Source 
The documentation indicates you're not really meant to use the walker directly.
They're part of the implementation of the iterators. They could be used directly,
as shown here, but this is shorter.

(cherry-picked from commit aca7d4e6df4648ff45f48b6acb9e643de8c05103)
This commit is contained in:
Charles Dang 2018-06-23 16:29:06 +11:00
parent 4dd931b54c
commit b9c26464b6
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/dialogs/select_orb_colors.cpp
View File

@ -16,7 +16,7 @@
#include "gui/dialogs/select_orb_colors.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/auxiliary/iterator/walker.hpp"
#include "gui/auxiliary/iterator/iterator.hpp"
#include "gui/core/event/dispatcher.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/grid.hpp"
@ -101,20 +101,14 @@ void select_orb_colors::setup_orb_group(const std::string& base_id, bool& shown,
//
group<std::string>& group = groups_[base_id];
using iteration::walker_base;
// Grid containing each color option toggle.
grid& selection = find_widget<grid>(get_window(), prefix + "selection", false);
std::unique_ptr<iteration::walker_base> iter(selection.create_walker());
while(!iter->at_end(walker_base::child)) {
widget* next = iter->get(walker_base::child);
if(toggle_button* button = dynamic_cast<toggle_button*>(next)) {
for(iteration::bottom_up_iterator<true, false, true> iter(selection); !iter.at_end(); ++iter) {
if(toggle_button* button = dynamic_cast<toggle_button*>(iter.get())) {
const std::string& id = button->id();
group.add_member(button, id.substr(prefix.size()));
}
iter->next(walker_base::child);
}
group.set_member_states(initial);