TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set the correct scroll position for the listbox when it's shown

Browse source
This commit is contained in:
kreatordxx 2010-02-06 01:41:38 +00:00
parent 134f6dc388
commit e5adf29b6c
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20100206
--------
main/newmenu.c: Set the correct scroll position for the listbox when it's shown
20100205
--------
main/game.c, main/gameseq.c, main/newdemo.c: Use palette_save and palette_restore for all windows displayed over Game_wind, not just for do_option

42
main/newmenu.c
View file

@ -1723,6 +1723,28 @@ void listbox_delete_item(listbox *lb, int item)
}
}
void update_scroll_position(listbox *lb)
{
if (lb->citem<0)
lb->citem=0;
if (lb->citem>=lb->nitems)
lb->citem = lb->nitems-1;
if (lb->citem< lb->first_item)
lb->first_item = lb->citem;
if (lb->citem>=( lb->first_item+LB_ITEMS_ON_SCREEN))
lb->first_item = lb->citem-LB_ITEMS_ON_SCREEN+1;
if (lb->nitems <= LB_ITEMS_ON_SCREEN )
lb->first_item = 0;
if (lb->first_item>lb->nitems-LB_ITEMS_ON_SCREEN)
lb->first_item = lb->nitems-LB_ITEMS_ON_SCREEN;
if (lb->first_item < 0 ) lb->first_item = 0;
}
int listbox_key_command(window *wind, d_event *event, listbox *lb)
{
int key = ((d_event_keycommand *)event)->keycode;
@ -1806,24 +1828,7 @@ int listbox_key_command(window *wind, d_event *event, listbox *lb)
}
}
if (lb->citem<0)
lb->citem=0;
if (lb->citem>=lb->nitems)
lb->citem = lb->nitems-1;
if (lb->citem< lb->first_item)
lb->first_item = lb->citem;
if (lb->citem>=( lb->first_item+LB_ITEMS_ON_SCREEN))
lb->first_item = lb->citem-LB_ITEMS_ON_SCREEN+1;
if (lb->nitems <= LB_ITEMS_ON_SCREEN )
lb->first_item = 0;
if (lb->first_item>lb->nitems-LB_ITEMS_ON_SCREEN)
lb->first_item = lb->nitems-LB_ITEMS_ON_SCREEN;
if (lb->first_item < 0 ) lb->first_item = 0;
update_scroll_position(lb);
return rval;
}
@ -2049,6 +2054,7 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
if ( lb->citem >= nitems ) lb->citem = 0;
lb->first_item = 0;
update_scroll_position(lb);
lb->mouse_state = lb->omouse_state = 0; //dblclick_flag = 0;