Skip to content
Permalink
Browse files

Bug 4576: fix warning and compile

  • Loading branch information
1bsyl committed Apr 2, 2019
1 parent 9b3c225 commit b45abbb2a758dde64a725a9fc588f32daa10f620
@@ -253,8 +253,8 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid,
if (window) {
if (down) {
if (finger_touching == SDL_FALSE) {
int pos_x = x * window->w;
int pos_y = y * window->y;
int pos_x = (int)(x * (float)window->w);
int pos_y = (int)(y * (float)window->y);
finger_touching = SDL_TRUE;
first_finger = fingerid;
SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
@@ -339,8 +339,8 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
SDL_Window *window = SDL_GetMouseFocus();
if (window) {
if (finger_touching == SDL_TRUE && first_finger == fingerid) {
int pos_x = x * window->w;
int pos_y = y * window->y;
int pos_x = (int)(x * (float)window->w);
int pos_y = (int)(y * (float)window->y);
SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
}
}
@@ -68,7 +68,6 @@ void Android_OnTouch(SDL_Window *window, int touch_device_id_in, int pointer_fin
{
SDL_TouchID touchDeviceId = 0;
SDL_FingerID fingerId = 0;
int window_x, window_y;

if (!window) {
return;
@@ -431,7 +431,6 @@ Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, vo
static EM_BOOL
Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData)
{
SDL_WindowData *window_data = userData;
int i;
double client_w, client_h;
int preventDefault = 0;
@@ -528,7 +528,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
SDL_Mouse *mouse = SDL_GetMouse();
if (!mouse->relative_mode || mouse->relative_mode_warp) {
if ((GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) != MOUSEEVENTF_FROMTOUCH) {
WIN_CheckWParamMouseButtons(wParam, data, mouseID);
WIN_CheckWParamMouseButtons(wParam, data, 0);
}
}
}

0 comments on commit b45abbb

Please sign in to comment.