pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed drag area API to a hit-testing API.

Browse source 
There were several good arguments for this: it's how Windows works with
 WM_NCHITTEST, SDL doesn't need to manage a list of rects, it allows more
 control over the regions (how do you use rects to cleanly surround a circular
 button?), the callback can be more optimized than a iterating a list of
 rects, and you don't have to send an updated list of rects whenever the
 window resizes or layout changes.

--HG--
rename : test/testdragareas.c => test/testhittesting.c
This commit is contained in:
Ryan C. Gordon 2014-05-28 01:22:47 -04:00
parent 51a004c734
commit 9e98d09104
15 changed files with 106 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/video/x11/SDL_x11events.c
View file

@ -303,21 +303,16 @@ InitiateWindowMove(_THIS, const SDL_WindowData *data, const SDL_Point *point)
}
static SDL_bool
ProcessDragArea(_THIS, const SDL_WindowData *data, const XEvent *xev)
ProcessHitTest(_THIS, const SDL_WindowData *data, const XEvent *xev)
{
const SDL_Window *window = data->window;
const int num_areas = window->num_drag_areas;
SDL_Window *window = data->window;
if (num_areas > 0) {
if (window->hit_test) {
const SDL_Point point = { xev->xbutton.x, xev->xbutton.y };
const SDL_Rect *areas = window->drag_areas;
int i;
for (i = 0; i < num_areas; i++) {
if (SDL_PointInRect(&point, &areas[i])) {
InitiateWindowMove(_this, data, &point);
return SDL_TRUE; /* dragging, drop this event. */
}
const SDL_HitTestResult rc = window->hit_test(window, &point, window->hit_test_data);
if (rc == SDL_HITTEST_DRAGGABLE) {
InitiateWindowMove(_this, data, &point);
return SDL_TRUE; /* dragging, drop this event. */
}
}
@ -762,7 +757,7 @@ X11_DispatchEvent(_THIS)
SDL_SendMouseWheel(data->window, 0, 0, ticks);
} else {
if(xevent.xbutton.button == Button1) {
if (ProcessDragArea(_this, data, &xevent)) {
if (ProcessHitTest(_this, data, &xevent)) {
break; /* don't pass this event on to app. */
}
}