gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy pen handling code from SDLSurface to SDLControllerManager

Browse Source
This commit is contained in:
Susko3
2025-01-22 04:54:57 +00:00
committed by Sam Lantinga
parent 6f3d0b3cdb
commit 73fc2b03a3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
View File

@@ -705,9 +705,14 @@ class SDLGenericMotionListener_API14 implements View.OnGenericMotionListener {
x = event.getX(i); x = event.getX(i);
y = event.getY(i); y = event.getY(i);
float p = event.getPressure(i); float p = event.getPressure(i);
if (p > 1.0f) {
// may be larger than 1.0f on some devices
// see the documentation of getPressure(i)
p = 1.0f;
}
// BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4 // BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4, and apply SDL_PEN_INPUT_DOWN/SDL_PEN_INPUT_ERASER_TIP
int buttons = event.getButtonState() >> 4; int buttons = (event.getButtonState() >> 4) | (1 << (toolType == MotionEvent.TOOL_TYPE_STYLUS ? 0 : 30));
SDLActivity.onNativePen(event.getPointerId(i), buttons, action, x, y, p); SDLActivity.onNativePen(event.getPointerId(i), buttons, action, x, y, p);
consumed = true; consumed = true;