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

Add visibility checks to up/left arrow handling

Browse source 
For some reason, these checks were only present in down/right handling, meaning the up
arrow (confirm) and left arrow (presumed) would allow selecting of non-visible items.
This commit is contained in:
Charles Dang 2016-08-02 12:06:38 +11:00
parent 69bb5a155b
commit 7332dafd75
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/widgets/generator.cpp
View file

@ -264,6 +264,12 @@ void thorizontal_list::handle_key_left_arrow(SDLMod /*modifier*/, bool& handled)
for(int i = get_ordered_index(get_selected_item()) - 1; i >= 0; --i) {
if(item(get_item_at_ordered(i)).get_visible() == twidget::tvisible::invisible
|| !get_item_shown(get_item_at_ordered(i))) {
continue;
}
// NOTE we check the first widget to be active since grids have no
// active flag. This method might not be entirely reliable.
tcontrol* control = dynamic_cast<tcontrol*>(item(get_item_at_ordered(i)).widget(0, 0));
@ -464,6 +470,12 @@ void tvertical_list::handle_key_up_arrow(SDLMod /*modifier*/, bool& handled)
for(int i = get_ordered_index(get_selected_item()) - 1; i >= 0; --i) {
if(item_ordered(i).get_visible() == twidget::tvisible::invisible
|| !get_item_shown(get_item_at_ordered(i))) {
continue;
}
// NOTE we check the first widget to be active since grids have no
// active flag. This method might not be entirely reliable.
tcontrol* control = dynamic_cast<tcontrol*>(item_ordered(i).widget(0, 0));
@ -485,7 +497,6 @@ void tvertical_list::handle_key_down_arrow(SDLMod /*modifier*/, bool& handled)
for(size_t i = get_ordered_index(get_selected_item()) + 1; i < get_item_count(); ++i) {
// why do we do this check here but not in handle_key_up_arrow?
if(item_ordered(i).get_visible() == twidget::tvisible::invisible
|| !get_item_shown(get_item_at_ordered(i))) {