mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 19:13:40 +01:00
Merge branch 'master' into TemporaryHackishBranch
# Conflicts: # UI/ControlMappingScreen.cpp
This commit is contained in:
commit
23b51deb26
18 files changed
+171
-104
No files matched your search
@@ -258,7 +258,7 @@ namespace MainWindow
|
||||
}
|
||||
}
|
||||
|
||||
void RelaseMouseWheel() {
|
||||
void ReleaseMouseWheel() {
|
||||
// For simplicity release both wheel events
|
||||
KeyInput key;
|
||||
key.deviceId = DEVICE_ID_MOUSE;
|
||||
@@ -856,7 +856,8 @@ namespace MainWindow
|
||||
return 0;
|
||||
// Hack: need to release wheel event with a delay for games to register it was "pressed down".
|
||||
case TIMER_WHEELRELEASE:
|
||||
RelaseMouseWheel();
|
||||
ReleaseMouseWheel();
|
||||
KillTimer(hWnd, TIMER_WHEELRELEASE);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user