...

3 files changed, 43 insertions, 63 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 62ae1775..3186b0f5 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -3,6 +3,7 @@ file(GLOB CRU_UI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/ui)
 add_library(cru_ui STATIC
 	routed_event_dispatch.hpp
 
+	click_detector.cpp
     content_control.cpp
     control.cpp
     layout_control.cpp
@@ -20,6 +21,7 @@ add_library(cru_ui STATIC
 )
 target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/base.hpp
+	${CRU_UI_INCLUDE_DIR}/click_detector.hpp
 	${CRU_UI_INCLUDE_DIR}/content_control.hpp
 	${CRU_UI_INCLUDE_DIR}/control.hpp
 	${CRU_UI_INCLUDE_DIR}/layout_control.hpp
diff --git a/src/ui/click_detector.cpp b/src/ui/click_detector.cpp
new file mode 100644
index 00000000..1442b885
--- /dev/null
+++ b/src/ui/click_detector.cpp
@@ -0,0 +1,32 @@
+#include "cru/ui/click_detector.hpp"
+
+#include <cassert>
+#include <optional>
+
+namespace cru::ui {
+ClickDetector::ClickDetector(Control* control) {
+  assert(control);
+  control_ = control;
+
+  event_rovoker_guards_.push_front(
+      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
+          })));
+
+  event_rovoker_guards_.push_front(
+      EventRevokerGuard(control->MouseUpEvent()->Direct()->AddHandler(
+          [this, control](event::MouseButtonEventArgs& args) {
+            if (!control->IsMouseCaptured()) return;
+            const auto button = args.GetMouseButton();
+            auto& down_point = FromButton(button);
+            if (down_point.has_value()) {
+              event_.Raise(ClickEventArgs(control, down_point.value(),
+                                          args.GetPoint(), button));
+              down_point = std::nullopt;
+            }
+          })));
+}
+}  // namespace cru::ui
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index bcf56c5e..d529b687 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -9,74 +9,20 @@
 #include <cassert>
 
 namespace cru::ui {
+Control::Control() {
+  MouseEnterEvent()->Direct()->AddHandler(
+      [this](event::MouseEventArgs&) { this->is_mouse_over_ = true; });
+
+  MouseLeaveEvent()->Direct()->AddHandler(
+      [this](event::MouseEventArgs&) { this->is_mouse_over_ = false; });
+}
+
 void Control::_SetParent(Control* parent) {
   const auto old_parent = GetParent();
   parent_ = parent;
   const auto new_parent = GetParent();
   if (old_parent != new_parent) OnParentChanged(old_parent, new_parent);
-
-  MouseDownEvent()->Direct()->AddHandler(
-      [this](event::MouseButtonEventArgs& args) {
-        switch (args.GetMouseButton()) {
-          case MouseButton::Left:
-            click_map_.left = true;
-            OnMouseClickBegin(MouseButton::Left);
-            break;
-          case MouseButton::Middle:
-            click_map_.middle = true;
-            OnMouseClickBegin(MouseButton::Middle);
-            break;
-          case MouseButton::Right:
-            click_map_.right = true;
-            OnMouseClickBegin(MouseButton::Right);
-            break;
-        }
-      });
-
-  MouseEnterEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) {
-    this->is_mouse_over_ = true;
-  });
-
-  MouseLeaveEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) {
-    this->is_mouse_over_ = false;
-    if (click_map_.left) {
-      OnMouseClickCancel(MouseButton::Left);
-    }
-    if (click_map_.middle) {
-      OnMouseClickCancel(MouseButton::Middle);
-    }
-    if (click_map_.right) {
-      OnMouseClickCancel(MouseButton::Right);
-    }
-    click_map_.left = click_map_.middle = click_map_.right = false;
-  });
-
-  MouseUpEvent()->Direct()->AddHandler([this](event::MouseButtonEventArgs& args) {
-    switch (args.GetMouseButton()) {
-      case MouseButton::Left:
-        if (click_map_.left) {
-          click_map_.left = false;
-          OnMouseClickEnd(MouseButton::Left);
-          DispatchEvent(this, &Control::MouseClickEvent, nullptr, args.GetPoint(), args.GetMouseButton());
-        }
-        break;
-      case MouseButton::Middle:
-        if (click_map_.middle) {
-          click_map_.middle = false;
-          OnMouseClickEnd(MouseButton::Middle);
-          DispatchEvent(this, &Control::MouseClickEvent, nullptr, args.GetPoint(), args.GetMouseButton());
-        }
-        break;
-      case MouseButton::Right:
-        if (click_map_.right) {
-          click_map_.right = false;
-          OnMouseClickEnd(MouseButton::Right);
-          DispatchEvent(this, &Control::MouseClickEvent, nullptr, args.GetPoint(), args.GetMouseButton());
-        }
-        break;
-    }
-  });
-}  // namespace cru::ui
+}
 
 void Control::_SetDescendantWindow(Window* window) {
   if (window == nullptr && window_ == nullptr) return;