1 files changed, 2 insertions, 54 deletions

diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 9eabc4a6..e17d603c 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -4,64 +4,12 @@
 #include "cru/platform/native/native_window.hpp"
 #include "cru/platform/native/ui_applicaition.hpp"
 #include "cru/ui/render/window_render_object.hpp"
+#include "routed_event_dispatch.hpp"
 
 #include <cassert>
 
 namespace cru::ui {
 namespace {
-// Dispatch the event.
-//
-// This will raise routed event of the control and its parent and parent's
-// parent ... (until "last_receiver" if it's not nullptr) with appropriate args.
-//
-// First tunnel from top to bottom possibly stopped by "handled" flag in
-// EventArgs. Second bubble from bottom to top possibly stopped by "handled"
-// flag in EventArgs. Last direct to each control.
-//
-// Args is of type "EventArgs". The first init argument is "sender", which is
-// automatically bound to each receiving control. The second init argument is
-// "original_sender", which is unchanged. And "args" will be perfectly forwarded
-// as the rest arguments.
-template <typename EventArgs, typename... Args>
-void DispatchEvent(Control* const original_sender,
-                   event::RoutedEvent<EventArgs>* (Control::*event_ptr)(),
-                   Control* const last_receiver, Args&&... args) {
-  std::list<Control*> receive_list;
-
-  auto parent = original_sender;
-  while (parent != last_receiver) {
-    receive_list.push_back(parent);
-    parent = parent->GetParent();
-  }
-
-  auto handled = false;
-
-  // tunnel
-  for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) {
-    EventArgs event_args(*i, original_sender, std::forward<Args>(args)...);
-    (*i->*event_ptr)()->tunnel.Raise(event_args);
-    if (event_args.IsHandled()) {
-      handled = true;
-      break;
-    }
-  }
-
-  // bubble
-  if (!handled) {
-    for (auto i : receive_list) {
-      EventArgs event_args(i, original_sender, std::forward<Args>(args)...);
-      (i->*event_ptr)()->bubble.Raise(event_args);
-      if (event_args.IsHandled()) break;
-    }
-  }
-
-  // direct
-  for (auto i : receive_list) {
-    EventArgs event_args(i, original_sender, std::forward<Args>(args)...);
-    (i->*event_ptr)()->direct.Raise(event_args);
-  }
-}
-
 std::list<Control*> GetAncestorList(Control* control) {
   std::list<Control*> l;
   while (control != nullptr) {
@@ -157,7 +105,7 @@ void Window::InvalidateLayout() {
             window->Relayout();
             window->need_layout_ = false;
           }
-      });
+        });
     need_layout_ = true;
   }
 }