From e0f12a9998bad94fdd0911e8749f4427021f3d04 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 18 May 2022 19:31:32 +0100 Subject: [PATCH] Fix mouse up event for imgui based widgets Signed-off-by: falkTX --- plugins/Cardinal/src/ImGuiWidget.cpp | 6 +----- plugins/Cardinal/src/ImGuiWidget.hpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/Cardinal/src/ImGuiWidget.cpp b/plugins/Cardinal/src/ImGuiWidget.cpp index 9233036..4ca8c07 100644 --- a/plugins/Cardinal/src/ImGuiWidget.cpp +++ b/plugins/Cardinal/src/ImGuiWidget.cpp @@ -270,16 +270,12 @@ void ImGuiWidget::onDragHover(const DragHoverEvent& e) } } -void ImGuiWidget::onDragLeave(const DragLeaveEvent& e) +void ImGuiWidget::onDragEnd(const DragEndEvent& e) { ImGui::SetCurrentContext(imData->context); - // FIXME this is not the correct event.. ImGuiIO& io(ImGui::GetIO()); io.MouseDown[0] = io.MouseDown[1] = io.MouseDown[2] = false; - - if (io.WantCaptureMouse) - e.consume(this); } void ImGuiWidget::onHoverScroll(const HoverScrollEvent& e) diff --git a/plugins/Cardinal/src/ImGuiWidget.hpp b/plugins/Cardinal/src/ImGuiWidget.hpp index a283701..c24d506 100644 --- a/plugins/Cardinal/src/ImGuiWidget.hpp +++ b/plugins/Cardinal/src/ImGuiWidget.hpp @@ -34,7 +34,7 @@ protected: void onContextDestroy(const ContextDestroyEvent& e) override; void onHover(const HoverEvent& e) override; void onDragHover(const DragHoverEvent& e) override; - void onDragLeave(const DragLeaveEvent& e) override; + void onDragEnd(const DragEndEvent& e) override; void onHoverScroll(const HoverScrollEvent& e) override; void onButton(const ButtonEvent& e) override; void onSelectKey(const SelectKeyEvent& e) override;