upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 11:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to bd258cdcab93 as suggested

Browse Source
This commit is contained in:
Charles Dang 2016-11-19 22:46:03 +11:00
parent 910a81b6cc
commit 5630efdac3
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/widgets/group.hpp
View File

@ -30,7 +30,7 @@ template<class T>
class group
{
using group_map = std::map<T, selectable_item*>;
using order_vector = std::vector<selectable_item*>;
using order_vector = std::vector<styled_widget*>;
public:
/**
@ -45,7 +45,7 @@ public:
dynamic_cast<widget*>(w)->connect_signal<event::LEFT_BUTTON_CLICK>(
std::bind(&group::group_operator, this), event::dispatcher::front_child);
member_order_.push_back(w);
member_order_.push_back(dynamic_cast<styled_widget*>(w));
}
/**
@ -143,15 +143,13 @@ public:
selectable_item& w = *member.second;
dynamic_cast<styled_widget&>(w).set_active(res);
// TODO: we shouldn't need to set do_reselect twice...
if(w.get_value_bool()) {
do_reselect = false;
}
// Only select another member if this was selected
if(!res && w.get_value_bool()) {
w.set_value_bool(false);
do_reselect = true;
if(w.get_value_bool()) {
do_reselect = !res;
if(do_reselect) {
w.set_value_bool(false);
}
}
}
@ -161,8 +159,8 @@ public:
// Look for the first active member to select
for(auto& member : member_order_) {
if(dynamic_cast<styled_widget&>(*member).get_active()) {
member->set_value_bool(true);
if(member->get_active()) {
dynamic_cast<selectable_item&>(*member).set_value_bool(true);
break;
}
}