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

Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)

Browse source
This commit is contained in:
Chris Taylor 2011-11-12 12:46:29 +08:00
parent 1c305434f4
commit 33b1b6118d
3 changed files with 64 additions and 16 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
20111112
--------
ui/gadget.c, ui/scroll.c: Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
20111106
--------
include/ui.h, ui/dialog.c, ui/listbox.c: Make ui_listbox_do fully event-responsive

2
ui/gadget.c
View file

@ -310,7 +310,7 @@ int ui_dialog_do_gadgets(UI_DIALOG * dlg, d_event *event)
}
tmp = tmp->next;
} while( !rval && tmp != dlg->gadget );
} while(/* !rval && */tmp != dlg->gadget ); // FIXME: Have to loop through all the controls, because of controls within controls
return rval;
}

74
ui/scroll.c
View file

@ -100,6 +100,7 @@ int ui_scrollbar_do( UI_GADGET_SCROLLBAR * scrollbar, d_event *event )
{
int OnMe, OnSlider, keyfocus;
int oldpos, op;
int x, y, z;
int rval = 0;
keyfocus = 0;
@ -122,7 +123,42 @@ int ui_scrollbar_do( UI_GADGET_SCROLLBAR * scrollbar, d_event *event )
scrollbar->moved = 0;
if ( (scrollbar->up_button->position!=0) || (keyfocus && keyd_pressed[KEY_UP]) )
if (keyfocus && event->type == EVENT_KEY_COMMAND)
{
int key;
key = event_key_get(event);
if (key & KEY_UP)
{
scrollbar->up_button->position = 2;
rval = 1;
}
else if (key & KEY_DOWN)
{
scrollbar->down_button->position = 2;
rval = 1;
}
}
else if (keyfocus && event->type == EVENT_KEY_RELEASE)
{
int key;
key = event_key_get(event);
if (key & KEY_UP)
{
scrollbar->up_button->position = 0;
rval = 1;
}
else if (key & KEY_DOWN)
{
scrollbar->down_button->position = 0;
rval = 1;
}
}
if (scrollbar->up_button->position!=0)
{
if (timer_query() > scrollbar->last_scrolled + 1)
{
@ -136,7 +172,7 @@ int ui_scrollbar_do( UI_GADGET_SCROLLBAR * scrollbar, d_event *event )
}
}
if ( (scrollbar->down_button->position!=0) || (keyfocus && keyd_pressed[KEY_DOWN]) )
if (scrollbar->down_button->position!=0)
{
if (timer_query() > scrollbar->last_scrolled + 1)
{
@ -154,31 +190,39 @@ int ui_scrollbar_do( UI_GADGET_SCROLLBAR * scrollbar, d_event *event )
//gr_ubox(0, scrollbar->fake_position, scrollbar->width-1, scrollbar->fake_position+scrollbar->fake_size-1 );
if (!B1_PRESSED )
if (B1_JUST_RELEASED)
scrollbar->dragging = 0;
//if (B1_PRESSED && OnMe )
// listbox->dragging = 1;
mouse_get_pos(&x, &y, &z);
OnSlider = 0;
if ((Mouse.y >= scrollbar->fake_position+scrollbar->y1) && \
(Mouse.y < scrollbar->fake_position+scrollbar->y1+scrollbar->fake_size) && OnMe )
if ((y >= scrollbar->fake_position+scrollbar->y1) && \
(y < scrollbar->fake_position+scrollbar->y1+scrollbar->fake_size) && OnMe )
OnSlider = 1;
if (B1_JUST_PRESSED && OnSlider )
{
scrollbar->dragging = 1;
scrollbar->drag_x = Mouse.x;
scrollbar->drag_y = Mouse.y;
scrollbar->drag_x = x;
scrollbar->drag_y = y;
scrollbar->drag_starting = scrollbar->fake_position;
rval = 1;
}
else if (B1_JUST_PRESSED && OnMe)
{
scrollbar->dragging = 2; // outside the slider
rval = 1;
}
if (B1_PRESSED && OnMe && !OnSlider && (timer_query() > scrollbar->last_scrolled + 4))
if ((scrollbar->dragging == 2) && OnMe && !OnSlider && (timer_query() > scrollbar->last_scrolled + 4))
{
scrollbar->last_scrolled = timer_query();
if ( Mouse.y < scrollbar->fake_position+scrollbar->y1 )
if ( y < scrollbar->fake_position+scrollbar->y1 )
{
// Page Up
scrollbar->position -= scrollbar->window_size;
@ -196,22 +240,22 @@ int ui_scrollbar_do( UI_GADGET_SCROLLBAR * scrollbar, d_event *event )
scrollbar->fake_position /= (scrollbar->stop-scrollbar->start);
}
if ((selected_gadget==(UI_GADGET *)scrollbar) && B1_PRESSED && scrollbar->dragging )
if ((selected_gadget==(UI_GADGET *)scrollbar) && (scrollbar->dragging == 1))
{
//Mouse.x = scrollbar->drag_x;
scrollbar->fake_position = scrollbar->drag_starting + (Mouse.y - scrollbar->drag_y );
//x = scrollbar->drag_x;
scrollbar->fake_position = scrollbar->drag_starting + (y - scrollbar->drag_y );
if (scrollbar->fake_position<0)
{
scrollbar->fake_position = 0;
//Mouse.y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
//y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
}
if (scrollbar->fake_position > (scrollbar->height-scrollbar->fake_size))
{
scrollbar->fake_position = (scrollbar->height-scrollbar->fake_size);
//Mouse.y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
//y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
}
//mouse_set_pos( Mouse.x, Mouse.y );
//mouse_set_pos( x, y );
scrollbar->position = scrollbar->fake_position;
scrollbar->position *= (scrollbar->stop-scrollbar->start);