preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-10 21:16:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Touch on Windows Desktop: Apply the DPI scale *after* ScreenToClient.

Browse Source 
Might further improve #9554.
This commit is contained in:
Henrik Rydgard committed 2017-04-05 15:36:31 +02:00
1 parent fc730b76df
commit 3ae13f3c05
1 file changed
+10 -14
Download Patch File Download Diff File Expand all files Collapse all files
Windows/TouchInputHandler.cpp
+10 -14
View File
@@ -41,8 +41,7 @@ void TouchInputHandler::handleTouchEvent(HWND hWnd, UINT message, WPARAM wParam,
if (touchInfo((HTOUCHINPUT) lParam,
inputCount,
inputs,
sizeof(TOUCHINPUT)))
{
sizeof(TOUCHINPUT))) {
for (UINT i = 0; i < inputCount; i++) {
int id = -1;
@@ -61,29 +60,26 @@ void TouchInputHandler::handleTouchEvent(HWND hWnd, UINT message, WPARAM wParam,
}
POINT point;
point.x = (float)(TOUCH_COORD_TO_PIXEL(inputs[i].x)) * g_dpi_scale;
point.y = (float)(TOUCH_COORD_TO_PIXEL(inputs[i].y)) * g_dpi_scale;
point.x = (float)(TOUCH_COORD_TO_PIXEL(inputs[i].x));
point.y = (float)(TOUCH_COORD_TO_PIXEL(inputs[i].y));
if (ScreenToClient(hWnd, &point)){
if (inputs[i].dwFlags & TOUCHEVENTF_DOWN)
{
if (ScreenToClient(hWnd, &point)) {
point.x *= g_dpi_scale;
point.y *= g_dpi_scale;
if (inputs[i].dwFlags & TOUCHEVENTF_DOWN) {
touchDown(id, point.x, point.y);
}
if (inputs[i].dwFlags & TOUCHEVENTF_MOVE)
{
if (inputs[i].dwFlags & TOUCHEVENTF_MOVE) {
touchMove(id, point.x, point.y);
}
if (inputs[i].dwFlags & TOUCHEVENTF_UP)
{
if (inputs[i].dwFlags & TOUCHEVENTF_UP) {
touchUp(id, point.x, point.y);
touchIds[id] = 0;
}
}
}
closeTouch((HTOUCHINPUT) lParam);
}
else
{
} else {
// GetLastError() and error handling.
}
delete [] inputs;