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

GUI2: remove every matching signal from an event queue when disconnecting

Browse source 
I'm not exactly sure if this is a desired change. It does allow the use of std::list::remove_if to simplify
the code a bit, but if first-only removal should be kept I can change it.
This commit is contained in:
Charles Dang 2017-05-01 23:18:16 +11:00
parent 890177d170
commit 81eb23c74e
1 changed files with 17 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/gui/core/event/dispatcher.hpp
View file

@ -681,54 +681,35 @@ public:
const queue_position position,
const T& signal)
{
/*
* The function doesn't differentiate between front and back
* position so fall down from front to back.
signal_type<T>& signal_queue = queue[event];
/* The function doesn't differentiate between front and back position so fall
* down from front to back.
*
* NOTE: This used to only remove the first signal of matching target type.
* That behavior could be restored in the future if needed.
* - vultraz 5/2/2017
*/
switch(position) {
case front_pre_child:
case back_pre_child: {
signal_type<T>& signal_queue = queue[event];
for(typename std::list<T>::iterator itor
= signal_queue.pre_child.begin();
itor != signal_queue.pre_child.end();
++itor) {
if(signal.target_type() == itor->target_type()) {
signal_queue.pre_child.erase(itor);
return;
}
}
signal_queue.pre_child.remove_if(
[&signal](T& element) { return signal.target_type() == element.target_type(); }
);
} break;
case front_child:
case back_child: {
signal_type<T>& signal_queue = queue[event];
for(typename std::list<T>::iterator itor
= signal_queue.child.begin();
itor != signal_queue.child.end();
++itor) {
if(signal.target_type() == itor->target_type()) {
signal_queue.child.erase(itor);
return;
}
}
signal_queue.child.remove_if(
[&signal](T& element) { return signal.target_type() == element.target_type(); }
);
} break;
case front_post_child:
case back_post_child: {
signal_type<T>& signal_queue = queue[event];
for(typename std::list<T>::iterator itor
= signal_queue.post_child.begin();
itor != signal_queue.post_child.end();
++itor) {
if(signal.target_type() == itor->target_type()) {
signal_queue.post_child.erase(itor);
return;
}
}
signal_queue.post_child.remove_if(
[&signal](T& element) { return signal.target_type() == element.target_type(); }
);
} break;
}
}