Mouse move ignored when pen tablet is in proximity

This commit is contained in:
Yousef Khadadeh 2025-07-08 06:39:52 -05:00
parent 9aafb63dc0
commit c5f7cd236e

View file

@ -613,6 +613,7 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
break; break;
case SDL_EVENT_MOUSE_MOTION: case SDL_EVENT_MOUSE_MOTION:
mS.m->window.scale = SDL_GetWindowPixelDensity(mS.window); mS.m->window.scale = SDL_GetWindowPixelDensity(mS.window);
if(!mS.m->input.pen.inProximity)
mS.m->input.mouse.set_pos({event->motion.x * mS.m->window.scale, event->motion.y * mS.m->window.scale}); mS.m->input.mouse.set_pos({event->motion.x * mS.m->window.scale, event->motion.y * mS.m->window.scale});
break; break;
case SDL_EVENT_MOUSE_BUTTON_UP: case SDL_EVENT_MOUSE_BUTTON_UP:
@ -674,6 +675,7 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
} }
case SDL_EVENT_PEN_MOTION: { case SDL_EVENT_PEN_MOTION: {
mS.m->input.pen.isEraser = event->pmotion.pen_state & SDL_PEN_INPUT_ERASER_TIP; mS.m->input.pen.isEraser = event->pmotion.pen_state & SDL_PEN_INPUT_ERASER_TIP;
if(mS.m->input.pen.inProximity)
mS.m->input.mouse.set_pos({event->pmotion.x, event->pmotion.y}); mS.m->input.mouse.set_pos({event->pmotion.x, event->pmotion.y});
break; break;
} }
@ -682,13 +684,13 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
mS.m->input.mouse.leftDown = true; mS.m->input.mouse.leftDown = true;
mS.m->input.mouse.leftClicks = 1; mS.m->input.mouse.leftClicks = 1;
mS.m->input.pen.isEraser = event->ptouch.eraser; mS.m->input.pen.isEraser = event->ptouch.eraser;
mS.m->input.mouse.set_pos({event->ptouch.x, event->ptouch.y}); //mS.m->input.mouse.set_pos({event->ptouch.x, event->ptouch.y});
break; break;
} }
case SDL_EVENT_PEN_AXIS: { case SDL_EVENT_PEN_AXIS: {
if(event->paxis.axis == SDL_PEN_AXIS_PRESSURE) if(event->paxis.axis == SDL_PEN_AXIS_PRESSURE)
mS.m->input.pen.pressure = event->paxis.value; mS.m->input.pen.pressure = event->paxis.value;
mS.m->input.mouse.set_pos({event->paxis.x, event->paxis.y}); //mS.m->input.mouse.set_pos({event->paxis.x, event->paxis.y});
break; break;
} }
case SDL_EVENT_PEN_UP: { case SDL_EVENT_PEN_UP: {
@ -696,17 +698,17 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
mS.m->input.mouse.leftDown = false; mS.m->input.mouse.leftDown = false;
mS.m->input.pen.isEraser = event->ptouch.eraser; mS.m->input.pen.isEraser = event->ptouch.eraser;
mS.m->input.pen.pressure = 0.0; mS.m->input.pen.pressure = 0.0;
mS.m->input.mouse.set_pos({event->ptouch.x, event->ptouch.y}); //mS.m->input.mouse.set_pos({event->ptouch.x, event->ptouch.y});
break; break;
} }
case SDL_EVENT_PEN_BUTTON_UP: { case SDL_EVENT_PEN_BUTTON_UP: {
mS.m->input.set_pen_button_up(event->pbutton); mS.m->input.set_pen_button_up(event->pbutton);
mS.m->input.mouse.set_pos({event->pbutton.x, event->pbutton.y}); //mS.m->input.mouse.set_pos({event->pbutton.x, event->pbutton.y});
break; break;
} }
case SDL_EVENT_PEN_BUTTON_DOWN: { case SDL_EVENT_PEN_BUTTON_DOWN: {
mS.m->input.set_pen_button_down(event->pbutton); mS.m->input.set_pen_button_down(event->pbutton);
mS.m->input.mouse.set_pos({event->pbutton.x, event->pbutton.y}); //mS.m->input.mouse.set_pos({event->pbutton.x, event->pbutton.y});
break; break;
} }
default: default: