From 04367ead7027e9f0359d24681f5cc0dd916b934d Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Mon, 12 Aug 2019 01:03:02 +0800 Subject: ... --- src/ui/click_detector.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/ui/click_detector.cpp') diff --git a/src/ui/click_detector.cpp b/src/ui/click_detector.cpp index 1442b885..b335f3b5 100644 --- a/src/ui/click_detector.cpp +++ b/src/ui/click_detector.cpp @@ -12,8 +12,9 @@ ClickDetector::ClickDetector(Control* control) { EventRevokerGuard(control->MouseDownEvent()->Direct()->AddHandler( [this, control](event::MouseButtonEventArgs& args) { if (!control->CaptureMouse()) return; // capture failed - FromButton(args.GetMouseButton()) = - args.GetPoint(); // save mouse down point + const auto button = args.GetMouseButton(); + FromButton(button) = args.GetPoint(); // save mouse down point + begin_event_.Raise(button); }))); event_rovoker_guards_.push_front( @@ -25,8 +26,10 @@ ClickDetector::ClickDetector(Control* control) { if (down_point.has_value()) { event_.Raise(ClickEventArgs(control, down_point.value(), args.GetPoint(), button)); + end_event_.Raise(button); down_point = std::nullopt; } + control->ReleaseMouse(); }))); } } // namespace cru::ui -- cgit v1.2.3