mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Fix pointer events with multiple buttons pressed

Browse source
This commit is contained in:
Teselka 2025-12-21 14:42:51 +02:00
parent 4d508f6e70
commit 1e0f1c2625
No known key found for this signature in database
GPG key ID: 15A5E34330F0C90A
1 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
backends/imgui_impl_emscripten.cpp
View file

@ -34,6 +34,7 @@ struct ImGui_ImplEmscripten_BackendData
int Height; int Height;
ImGuiMouseCursor LastMouseCursor; ImGuiMouseCursor LastMouseCursor;
int GamepadsCount; int GamepadsCount;
int PressedButtons;
}; };
// Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts // Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts
@ -360,12 +361,13 @@ extern "C"
#define IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_IS_PRIMARY 4 #define IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_IS_PRIMARY 4
EMSCRIPTEN_KEEPALIVE EMSCRIPTEN_KEEPALIVE
void ImGui_ImplEmscripten_PointerEvent(int type, int pointer_type, int flags, int x, int y, bool down, int button) void ImGui_ImplEmscripten_PointerEvent(int type, int pointer_type, int flags, int x, int y, int buttons)
{ {
if (!(flags & IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_IS_PRIMARY)) if (!(flags & IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_IS_PRIMARY))
return; return;
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
ImGui_ImplEmscripten_BackendData* bd = ImGui_ImplEmscripten_GetBackendData(io);
if (type == 5) if (type == 5)
{ {
@ -387,20 +389,19 @@ void ImGui_ImplEmscripten_PointerEvent(int type, int pointer_type, int flags, in
io.AddMousePosEvent((float)x, (float)y); io.AddMousePosEvent((float)x, (float)y);
if (flags & IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_HAS_BUTTON) if (flags & IMGUI_IMPL_EMSCRIPTEN_POINTER_EVENT_HAS_BUTTON)
{ {
ImGuiMouseButton imgui_button = ImGuiMouseButton_COUNT; // HACK: Browser executes pointerup/down only for single mouse button if multiple buttons were pressed at the same time
switch (button) #define PROCESS_BUTTON(key, flag) if ((buttons & flag) != (bd->PressedButtons & flag)) { io.AddMouseButtonEvent(key, buttons & flag); }
{ PROCESS_BUTTON(ImGuiMouseButton_Left, 1);
case 0: imgui_button = ImGuiMouseButton_Left; break; PROCESS_BUTTON(ImGuiMouseButton_Right, 2);
case 1: imgui_button = ImGuiMouseButton_Middle; break; PROCESS_BUTTON(ImGuiMouseButton_Middle, 4);
case 2: imgui_button = ImGuiMouseButton_Right; break; PROCESS_BUTTON(3, 8);
case 3: imgui_button = 3; break; PROCESS_BUTTON(4, 16);
case 4: imgui_button = 4; break; #undef PROCESS_BUTTON
}
if (imgui_button != ImGuiMouseButton_COUNT)
io.AddMouseButtonEvent(imgui_button, down);
} }
} }
if (type == 0 || type == 1 || type == 3)
bd->PressedButtons = buttons;
} }
}; };
@ -426,12 +427,12 @@ static void ImGui_ImplEmscripten_SetupPointerEvents(ImGui_ImplEmscripten_Backend
const el = document.querySelector(UTF8ToString($0)); const el = document.querySelector(UTF8ToString($0));
const cb = Module['_ImGui_ImplEmscripten_PointerEvent']; const cb = Module['_ImGui_ImplEmscripten_PointerEvent'];
el.imguiHandlePointerDown = function(ev) { cb(0, t(ev.pointerType), 1 | 2 | p(ev), ev.clientX, ev.clientY, true, ev.button); }; el.imguiHandlePointerDown = function(ev) { cb(0, t(ev.pointerType), 1 | 2 | p(ev), ev.clientX, ev.clientY, ev.buttons); };
el.imguiHandlePointerUp = function(ev) { cb(1, t(ev.pointerType), 1 | 2 | p(ev), ev.clientX, ev.clientY, false, ev.button); }; el.imguiHandlePointerUp = function(ev) { cb(1, t(ev.pointerType), 1 | 2 | p(ev), ev.clientX, ev.clientY, ev.buttons); };
el.imguiHandlePointerMove = function(ev) { cb(2, t(ev.pointerType), 1 | p(ev), ev.clientX, ev.clientY, false); }; el.imguiHandlePointerMove = function(ev) { cb(2, t(ev.pointerType), 1 | p(ev), ev.clientX, ev.clientY, ev.buttons); };
el.imguiHandlePointerCancel = function(ev) { cb(3, t(ev.pointerType), 2 | p(ev), 0, 0, false, ev.button); }; el.imguiHandlePointerCancel = function(ev) { cb(3, t(ev.pointerType), 2 | p(ev), 0, 0, ev.buttons); };
el.imguiHandlePointerEnter = function(ev) { cb(4, t(ev.pointerType), 0 | p(ev), 0, 0, false, -1); }; el.imguiHandlePointerEnter = function(ev) { cb(4, t(ev.pointerType), 0 | p(ev), 0, 0, ev.buttons); };
el.imguiHandlePointerLeave = function(ev) { cb(5, t(ev.pointerType), 0 | p(ev), 0, 0, false, -1); }; el.imguiHandlePointerLeave = function(ev) { cb(5, t(ev.pointerType), 0 | p(ev), 0, 0, ev.buttons); };
el.addEventListener('pointerdown', el.imguiHandlePointerDown); el.addEventListener('pointerdown', el.imguiHandlePointerDown);
el.addEventListener('pointerup', el.imguiHandlePointerUp); el.addEventListener('pointerup', el.imguiHandlePointerUp);
@ -540,6 +541,7 @@ bool ImGui_ImplEmscripten_Init(const char* target_id)
bd->LastMouseCursor = ImGuiMouseCursor_COUNT; bd->LastMouseCursor = ImGuiMouseCursor_COUNT;
bd->ClipboardTextData = nullptr; bd->ClipboardTextData = nullptr;
bd->GamepadsCount = 0; bd->GamepadsCount = 0;
bd->PressedButtons = 0;
size_t target_id_size = strlen(target_id); size_t target_id_size = strlen(target_id);
bd->TargetId = (char*)IM_ALLOC(target_id_size + 1); bd->TargetId = (char*)IM_ALLOC(target_id_size + 1);