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

Make listboxes accept arrow key input when no item is selected

Browse source 
The left and up arrow keys select the last item in the listbox.
The right and down arrow keys select the first item in the listbox.
This commit is contained in:
Celtic Minstrel 2016-09-07 03:11:53 -04:00
parent d8de472a57
commit fbdceb9fc6
1 changed files with 96 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,19 @@ const twidget* thorizontal_list::find_at(const tpoint& coordinate,
void thorizontal_list::handle_key_left_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(int i = get_ordered_index(get_item_count() - 1); i >= 0; i--) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -276,7 +288,19 @@ void thorizontal_list::handle_key_left_arrow(SDLMod /*modifier*/, bool& handled)
void thorizontal_list::handle_key_right_arrow(SDLMod /*modifier*/,
bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(size_t i = get_ordered_index(0); i < get_item_count(); i++) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -445,7 +469,19 @@ const twidget* tvertical_list::find_at(const tpoint& coordinate,
void tvertical_list::handle_key_up_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(int i = get_ordered_index(get_item_count() - 1); i >= 0; i--) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -471,7 +507,19 @@ void tvertical_list::handle_key_up_arrow(SDLMod /*modifier*/, bool& handled)
void tvertical_list::handle_key_down_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(size_t i = get_ordered_index(0); i < get_item_count(); i++) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -701,7 +749,19 @@ const twidget* tmatrix::find_at(const tpoint& coordinate,
void tmatrix::handle_key_up_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(int i = get_ordered_index(get_item_count() - 1); i >= 0; i--) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -727,7 +787,19 @@ void tmatrix::handle_key_up_arrow(SDLMod /*modifier*/, bool& handled)
void tmatrix::handle_key_down_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(size_t i = get_ordered_index(0); i < get_item_count(); i++) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -753,7 +825,19 @@ void tmatrix::handle_key_down_arrow(SDLMod /*modifier*/, bool& handled)
void tmatrix::handle_key_left_arrow(SDLMod /*modifier*/, bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(int i = get_ordered_index(get_item_count() - 1); i >= 0; i--) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}
@ -780,7 +864,19 @@ void tmatrix::handle_key_left_arrow(SDLMod /*modifier*/, bool& handled)
void tmatrix::handle_key_right_arrow(SDLMod /*modifier*/,
bool& handled)
{
if(get_item_count() == 0) {
return;
}
if(get_selected_item_count() == 0) {
for(size_t i = get_ordered_index(0); i < get_item_count(); i++) {
if(get_item_shown(get_item_at_ordered(i))) {
// TODO: Check if active?
handled = true;
select_item(get_item_at_ordered(i), true);
break;
}
}
return;
}