ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InputManager: Restore passing wheel events to ImGui

This commit is contained in:
Stenzek 2023-02-12 17:22:27 +10:00 committed by refractionpcsx2
parent c9aba6bbe1
commit 3eb629f133
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/Frontend/InputManager.cpp
View File

@ -960,7 +960,7 @@ void InputManager::GenerateRelativeMouseEvents()
const float delta = static_cast<float>(state.delta.exchange(0, std::memory_order_acquire)) / 65536.0f; const float delta = static_cast<float>(state.delta.exchange(0, std::memory_order_acquire)) / 65536.0f;
float value = 0.0f; float value = 0.0f;
if (axis < 2) if (axis <= static_cast<u32>(InputPointerAxis::Y))
{ {
s_pointer_pos[axis] += delta * s_pointer_axis_speed[axis]; s_pointer_pos[axis] += delta * s_pointer_axis_speed[axis];
value = std::clamp(s_pointer_pos[axis], -1.0f, 1.0f); value = std::clamp(s_pointer_pos[axis], -1.0f, 1.0f);
@ -975,6 +975,10 @@ void InputManager::GenerateRelativeMouseEvents()
} }
else else
{ {
// ImGui can consume mouse wheel events when the mouse is over a UI element.
if (delta != 0.0f && ImGuiManager::ProcessPointerAxisEvent(key, delta))
continue;
value = std::clamp(delta, -1.0f, 1.0f); value = std::clamp(delta, -1.0f, 1.0f);
} }