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

Make ui_userbox_do fully event-responsive

Browse source
This commit is contained in:
Chris Taylor 2011-11-14 19:27:04 +08:00
parent 33b1b6118d
commit d1a995ef6d
2 changed files with 27 additions and 12 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
20111114
--------
ui/userbox.c: Make ui_userbox_do fully event-responsive
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)

35
ui/userbox.c
View file

@ -79,19 +79,21 @@ UI_GADGET_USERBOX * ui_add_gadget_userbox( UI_DIALOG * dlg, short x, short y, sh
int ui_userbox_do( UI_GADGET_USERBOX * userbox, d_event *event )
{
int OnMe, olddrag;
int x, y, z;
int keypress = 0;
int rval = 0;
if (event->type == EVENT_KEY_COMMAND)
keypress = event_key_get(event);
mouse_get_pos(&x, &y, &z);
OnMe = ui_mouse_on_gadget( (UI_GADGET *)userbox );
olddrag = userbox->b1_dragging;
userbox->mouse_onme = OnMe;
userbox->mouse_x = Mouse.x - userbox->x1;
userbox->mouse_y = Mouse.y - userbox->y1;
userbox->mouse_x = x - userbox->x1;
userbox->mouse_y = y - userbox->y1;
userbox->b1_clicked = 0;
@ -100,30 +102,36 @@ int ui_userbox_do( UI_GADGET_USERBOX * userbox, d_event *event )
if ( B1_JUST_PRESSED )
{
userbox->b1_dragging = 1;
userbox->b1_drag_x1 = Mouse.x - userbox->x1;
userbox->b1_drag_y1 = Mouse.y - userbox->y1;
userbox->b1_drag_x1 = x - userbox->x1;
userbox->b1_drag_y1 = y - userbox->y1;
userbox->b1_clicked = 1;
rval = 1;
}
if ( B1_PRESSED )
else if (B1_JUST_RELEASED)
{
userbox->b1_held_down = 1;
userbox->b1_drag_x2 = Mouse.x - userbox->x1;
userbox->b1_drag_y2 = Mouse.y - userbox->y1;
}
else {
userbox->b1_held_down = 0;
userbox->b1_dragging = 0;
rval = 1;
}
if ( userbox->b1_dragging )
{
userbox->b1_held_down = 1;
userbox->b1_drag_x2 = x - userbox->x1;
userbox->b1_drag_y2 = y - userbox->y1;
}
if ( B1_DOUBLE_CLICKED )
{
userbox->b1_double_clicked = 1;
rval = 1;
}
else
userbox->b1_double_clicked = 0;
}
if (!B1_PRESSED)
if (B1_JUST_RELEASED)
userbox->b1_dragging = 0;
userbox->b1_done_dragging = 0;
@ -135,7 +143,10 @@ int ui_userbox_do( UI_GADGET_USERBOX * userbox, d_event *event )
}
if (CurWindow->keyboard_focus_gadget==(UI_GADGET *)userbox)
{
userbox->keypress = keypress;
rval = 1;
}
ui_draw_userbox( userbox );