Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The home/end keys are no longer able to select disabled entries.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14400 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-10-17 13:40:57 +00:00
parent 76a377394e
commit e84506daca
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/system/boot/platform/bios_ia32/menu.cpp
View File

@ -302,6 +302,42 @@ make_item_visible(Menu *menu, int32 selected)
} }
static int32
select_previous_valid_item(Menu *menu, int32 selected)
{
MenuItem *item;
while ((item = menu->ItemAt(selected)) != NULL) {
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
selected--;
}
if (selected < 0)
return first_selectable_item(menu);
return selected;
}
static int32
select_next_valid_item(Menu *menu, int32 selected)
{
MenuItem *item;
while ((item = menu->ItemAt(selected)) != NULL) {
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
selected++;
}
if (selected >= menu->CountItems())
return last_selectable_item(menu);
return selected;
}
static void static void
run_menu(Menu *menu) run_menu(Menu *menu)
{ {
@ -332,52 +368,22 @@ run_menu(Menu *menu)
switch (key.code.bios) { switch (key.code.bios) {
case BIOS_KEY_UP: case BIOS_KEY_UP:
while ((item = menu->ItemAt(--selected)) != NULL) { selected = select_previous_valid_item(menu, selected - 1);
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
}
if (selected < 0)
selected = last_selectable_item(menu);
break; break;
case BIOS_KEY_DOWN: case BIOS_KEY_DOWN:
while ((item = menu->ItemAt(++selected)) != NULL) { selected = select_next_valid_item(menu, selected + 1);
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
}
if (selected >= menu->CountItems())
selected = first_selectable_item(menu);
break; break;
case BIOS_KEY_PAGE_UP: case BIOS_KEY_PAGE_UP:
selected -= menu_height() - 1; selected = select_previous_valid_item(menu, selected - menu_height() + 1);
while ((item = menu->ItemAt(selected)) != NULL) {
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
selected--;
}
if (selected < 0)
selected = 0;
break; break;
case BIOS_KEY_PAGE_DOWN: case BIOS_KEY_PAGE_DOWN:
selected += menu_height() - 1; selected = select_next_valid_item(menu, selected + menu_height() - 1);
while ((item = menu->ItemAt(selected)) != NULL) {
if (item->IsEnabled() && item->Type() != MENU_ITEM_SEPARATOR)
break;
selected++;
}
if (selected >= menu->CountItems())
selected = menu->CountItems() - 1;
break; break;
case BIOS_KEY_HOME: case BIOS_KEY_HOME:
selected = 0; selected = first_selectable_item(menu);
break; break;
case BIOS_KEY_END: case BIOS_KEY_END:
selected = menu->CountItems() - 1; selected = last_selectable_item(menu);
break; break;
} }