encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4581 - generate synthetic mouse events at window boundaries 

when real touch events are actually outside the window.
This commit is contained in:
Sylvain Becker 2019-04-10 10:59:53 +02:00
parent cfefe5434a
commit aae49015da
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/events/SDL_touch.c
View File

@ -257,21 +257,19 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid,
if (finger_touching == SDL_FALSE) { if (finger_touching == SDL_FALSE) {
int pos_x = (int)(x * (float)window->w); int pos_x = (int)(x * (float)window->w);
int pos_y = (int)(y * (float)window->h); int pos_y = (int)(y * (float)window->h);
if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) { if (pos_x < 0) pos_x = 0;
if (pos_x > window->w - 1) pos_x = window->w - 1;
if (pos_y < 0) pos_y = 0;
if (pos_y > window->h - 1) pos_y = window->h - 1;
SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y); SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT); SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
} }
}
} else { } else {
if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) { if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
int pos_x = (int)(x * (float)window->w);
int pos_y = (int)(y * (float)window->h);
if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) {
SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
} }
} }
} }
}
if (down) { if (down) {
if (finger_touching == SDL_FALSE) { if (finger_touching == SDL_FALSE) {
finger_touching = SDL_TRUE; finger_touching = SDL_TRUE;
@ -361,14 +359,16 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) { if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
int pos_x = (int)(x * (float)window->w); int pos_x = (int)(x * (float)window->w);
int pos_y = (int)(y * (float)window->h); int pos_y = (int)(y * (float)window->h);
if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) { if (pos_x < 0) pos_x = 0;
if (pos_x > window->w - 1) pos_x = window->w - 1;
if (pos_y < 0) pos_y = 0;
if (pos_y > window->h - 1) pos_y = window->h - 1;
SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y); SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
} }
} }
} }
} }
} }
}
finger = SDL_GetFinger(touch,fingerid); finger = SDL_GetFinger(touch,fingerid);
if (!finger) { if (!finger) {