...

13 files changed, 278 insertions, 269 deletions

diff --git a/include/cru/ui/controls/Control.hpp b/include/cru/ui/controls/Control.hpp
index c6101370..29d48f21 100644
--- a/include/cru/ui/controls/Control.hpp
+++ b/include/cru/ui/controls/Control.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.hpp"
 
-#include "../events/UiEvent.hpp"
+#include "../events/UiEvents.hpp"
 #include "../render/Base.hpp"
 #include "cru/common/Event.hpp"
 
@@ -75,57 +75,57 @@ class Control : public Object {
   // the mouse, this event is raised as regular. But if mouse is captured by
   // another control, the control will not receive any mouse enter event. You
   // can use `IsMouseCaptured` to get more info.
-  event::RoutedEvent<event::MouseEventArgs>* MouseEnterEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseEnterEvent() {
     return &mouse_enter_event_;
   }
   // Raised when mouse is leave the control. Even when the control itself
   // captures the mouse, this event is raised as regular. But if mouse is
   // captured by another control, the control will not receive any mouse leave
   // event. You can use `IsMouseCaptured` to get more info.
-  event::RoutedEvent<event::MouseEventArgs>* MouseLeaveEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseLeaveEvent() {
     return &mouse_leave_event_;
   }
   // Raised when mouse is move in the control.
-  event::RoutedEvent<event::MouseEventArgs>* MouseMoveEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseMoveEvent() {
     return &mouse_move_event_;
   }
   // Raised when a mouse button is pressed in the control.
-  event::RoutedEvent<event::MouseButtonEventArgs>* MouseDownEvent() {
+  events::RoutedEvent<events::MouseButtonEventArgs>* MouseDownEvent() {
     return &mouse_down_event_;
   }
   // Raised when a mouse button is released in the control.
-  event::RoutedEvent<event::MouseButtonEventArgs>* MouseUpEvent() {
+  events::RoutedEvent<events::MouseButtonEventArgs>* MouseUpEvent() {
     return &mouse_up_event_;
   }
-  event::RoutedEvent<event::MouseWheelEventArgs>* MouseWheelEvent() {
+  events::RoutedEvent<events::MouseWheelEventArgs>* MouseWheelEvent() {
     return &mouse_wheel_event_;
   }
-  event::RoutedEvent<event::KeyEventArgs>* KeyDownEvent() {
+  events::RoutedEvent<events::KeyEventArgs>* KeyDownEvent() {
     return &key_down_event_;
   }
-  event::RoutedEvent<event::KeyEventArgs>* KeyUpEvent() {
+  events::RoutedEvent<events::KeyEventArgs>* KeyUpEvent() {
     return &key_up_event_;
   }
-  event::RoutedEvent<event::FocusChangeEventArgs>* GainFocusEvent() {
+  events::RoutedEvent<events::FocusChangeEventArgs>* GainFocusEvent() {
     return &gain_focus_event_;
   }
-  event::RoutedEvent<event::FocusChangeEventArgs>* LoseFocusEvent() {
+  events::RoutedEvent<events::FocusChangeEventArgs>* LoseFocusEvent() {
     return &lose_focus_event_;
   }
 
  private:
-  event::RoutedEvent<event::MouseEventArgs> mouse_enter_event_;
-  event::RoutedEvent<event::MouseEventArgs> mouse_leave_event_;
-  event::RoutedEvent<event::MouseEventArgs> mouse_move_event_;
-  event::RoutedEvent<event::MouseButtonEventArgs> mouse_down_event_;
-  event::RoutedEvent<event::MouseButtonEventArgs> mouse_up_event_;
-  event::RoutedEvent<event::MouseWheelEventArgs> mouse_wheel_event_;
-
-  event::RoutedEvent<event::KeyEventArgs> key_down_event_;
-  event::RoutedEvent<event::KeyEventArgs> key_up_event_;
-
-  event::RoutedEvent<event::FocusChangeEventArgs> gain_focus_event_;
-  event::RoutedEvent<event::FocusChangeEventArgs> lose_focus_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_enter_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_leave_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_move_event_;
+  events::RoutedEvent<events::MouseButtonEventArgs> mouse_down_event_;
+  events::RoutedEvent<events::MouseButtonEventArgs> mouse_up_event_;
+  events::RoutedEvent<events::MouseWheelEventArgs> mouse_wheel_event_;
+
+  events::RoutedEvent<events::KeyEventArgs> key_down_event_;
+  events::RoutedEvent<events::KeyEventArgs> key_up_event_;
+
+  events::RoutedEvent<events::FocusChangeEventArgs> gain_focus_event_;
+  events::RoutedEvent<events::FocusChangeEventArgs> lose_focus_event_;
 
   //*************** region: tree ***************
  protected:
diff --git a/include/cru/ui/controls/TextHostControlService.hpp b/include/cru/ui/controls/TextHostControlService.hpp
index 93b74d09..1bdf0509 100644
--- a/include/cru/ui/controls/TextHostControlService.hpp
+++ b/include/cru/ui/controls/TextHostControlService.hpp
@@ -161,18 +161,18 @@ class TextHostControlService : public Object {
   void UpdateInputMethodPosition();
 
   template <typename TArgs>
-  void SetupOneHandler(event::RoutedEvent<TArgs>* (Control::*event)(),
+  void SetupOneHandler(events::RoutedEvent<TArgs>* (Control::*event)(),
                        void (TextHostControlService::*handler)(
-                           typename event::RoutedEvent<TArgs>::EventArgs)) {
+                           typename events::RoutedEvent<TArgs>::EventArgs)) {
     this->event_guard_ += (this->control_->*event)()->Bubble()->AddHandler(
         std::bind(handler, this, std::placeholders::_1));
   }
 
-  void MouseMoveHandler(event::MouseEventArgs& args);
-  void MouseDownHandler(event::MouseButtonEventArgs& args);
-  void MouseUpHandler(event::MouseButtonEventArgs& args);
-  void GainFocusHandler(event::FocusChangeEventArgs& args);
-  void LoseFocusHandler(event::FocusChangeEventArgs& args);
+  void MouseMoveHandler(events::MouseEventArgs& args);
+  void MouseDownHandler(events::MouseButtonEventArgs& args);
+  void MouseUpHandler(events::MouseButtonEventArgs& args);
+  void GainFocusHandler(events::FocusChangeEventArgs& args);
+  void LoseFocusHandler(events::FocusChangeEventArgs& args);
 
   void SetUpShortcuts();
 
diff --git a/include/cru/ui/events/FocusChangeEventArgs.hpp b/include/cru/ui/events/FocusChangeEventArgs.hpp
new file mode 100644
index 00000000..0e65c6e0
--- /dev/null
+++ b/include/cru/ui/events/FocusChangeEventArgs.hpp
@@ -0,0 +1,23 @@
+#pragma once
+#include "UiEventArgs.hpp"
+
+namespace cru::ui::events {
+
+class FocusChangeEventArgs : public UiEventArgs {
+ public:
+  FocusChangeEventArgs(Object* sender, Object* original_sender,
+                       const bool is_window = false)
+      : UiEventArgs(sender, original_sender), is_window_(is_window) {}
+  FocusChangeEventArgs(const FocusChangeEventArgs& other) = default;
+  FocusChangeEventArgs(FocusChangeEventArgs&& other) = default;
+  FocusChangeEventArgs& operator=(const FocusChangeEventArgs& other) = default;
+  FocusChangeEventArgs& operator=(FocusChangeEventArgs&& other) = default;
+  ~FocusChangeEventArgs() override = default;
+
+  // Return whether the focus change is caused by the window-wide focus change.
+  bool IsWindow() const { return is_window_; }
+
+ private:
+  bool is_window_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/KeyEventArgs.hpp b/include/cru/ui/events/KeyEventArgs.hpp
new file mode 100644
index 00000000..e402dd07
--- /dev/null
+++ b/include/cru/ui/events/KeyEventArgs.hpp
@@ -0,0 +1,29 @@
+#pragma once
+#include "UiEventArgs.hpp"
+
+#include "cru/platform/gui/Keyboard.hpp"
+
+namespace cru::ui::events {
+class KeyEventArgs : public UiEventArgs {
+ public:
+  KeyEventArgs(Object* sender, Object* original_sender,
+               platform::gui::KeyCode key_code,
+               platform::gui::KeyModifier key_modifier)
+      : UiEventArgs(sender, original_sender),
+        key_code_(key_code),
+        key_modifier_(key_modifier) {}
+  KeyEventArgs(const KeyEventArgs& other) = default;
+  KeyEventArgs(KeyEventArgs&& other) = default;
+  KeyEventArgs& operator=(const KeyEventArgs& other) = default;
+  KeyEventArgs& operator=(KeyEventArgs&& other) = default;
+  ~KeyEventArgs() override = default;
+
+  platform::gui::KeyCode GetKeyCode() const { return key_code_; }
+  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
+
+ private:
+  platform::gui::KeyCode key_code_;
+  platform::gui::KeyModifier key_modifier_;
+};
+
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/MouseButtonEventArgs.hpp b/include/cru/ui/events/MouseButtonEventArgs.hpp
new file mode 100644
index 00000000..179ce8c8
--- /dev/null
+++ b/include/cru/ui/events/MouseButtonEventArgs.hpp
@@ -0,0 +1,35 @@
+#pragma once
+#include "MouseEventArgs.hpp"
+
+#include "cru/platform/gui/Keyboard.hpp"
+
+namespace cru::ui::events {
+
+class MouseButtonEventArgs : public MouseEventArgs {
+ public:
+  MouseButtonEventArgs(Object* sender, Object* original_sender,
+                       const Point& point, const MouseButton button,
+                       platform::gui::KeyModifier key_modifier)
+      : MouseEventArgs(sender, original_sender, point),
+        button_(button),
+        key_modifier_(key_modifier) {}
+  MouseButtonEventArgs(Object* sender, Object* original_sender,
+                       const MouseButton button,
+                       platform::gui::KeyModifier key_modifier)
+      : MouseEventArgs(sender, original_sender),
+        button_(button),
+        key_modifier_(key_modifier) {}
+  MouseButtonEventArgs(const MouseButtonEventArgs& other) = default;
+  MouseButtonEventArgs(MouseButtonEventArgs&& other) = default;
+  MouseButtonEventArgs& operator=(const MouseButtonEventArgs& other) = default;
+  MouseButtonEventArgs& operator=(MouseButtonEventArgs&& other) = default;
+  ~MouseButtonEventArgs() override = default;
+
+  MouseButton GetButton() const { return button_; }
+  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
+
+ private:
+  MouseButton button_;
+  platform::gui::KeyModifier key_modifier_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/MouseEventArgs.hpp b/include/cru/ui/events/MouseEventArgs.hpp
new file mode 100644
index 00000000..6d6aba15
--- /dev/null
+++ b/include/cru/ui/events/MouseEventArgs.hpp
@@ -0,0 +1,26 @@
+#pragma once
+#include "UiEventArgs.hpp"
+
+#include <optional>
+
+namespace cru::ui::events {
+class MouseEventArgs : public UiEventArgs {
+ public:
+  MouseEventArgs(Object* sender, Object* original_sender,
+                 const std::optional<Point>& point = std::nullopt)
+      : UiEventArgs(sender, original_sender), point_(point) {}
+  MouseEventArgs(const MouseEventArgs& other) = default;
+  MouseEventArgs(MouseEventArgs&& other) = default;
+  MouseEventArgs& operator=(const MouseEventArgs& other) = default;
+  MouseEventArgs& operator=(MouseEventArgs&& other) = default;
+  ~MouseEventArgs() override = default;
+
+  // This point is relative to window client lefttop.
+  Point GetPoint() const { return point_.value_or(Point{}); }
+  Point GetPoint(render::RenderObject* render_target) const;
+  Point GetPointToContent(render::RenderObject* render_target) const;
+
+ private:
+  std::optional<Point> point_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/MouseWheelEventArgs.hpp b/include/cru/ui/events/MouseWheelEventArgs.hpp
new file mode 100644
index 00000000..d0b3a145
--- /dev/null
+++ b/include/cru/ui/events/MouseWheelEventArgs.hpp
@@ -0,0 +1,29 @@
+#pragma once
+#include "MouseEventArgs.hpp"
+
+#include "cru/platform/gui/Keyboard.hpp"
+
+namespace cru::ui::events {
+class MouseWheelEventArgs : public MouseEventArgs {
+ public:
+  MouseWheelEventArgs(Object* sender, Object* original_sender,
+                      const Point& point, const float delta,
+                      platform::gui::KeyModifier key_modifier)
+      : MouseEventArgs(sender, original_sender, point),
+        delta_(delta),
+        key_modifier_(key_modifier) {}
+  MouseWheelEventArgs(const MouseWheelEventArgs& other) = default;
+  MouseWheelEventArgs(MouseWheelEventArgs&& other) = default;
+  MouseWheelEventArgs& operator=(const MouseWheelEventArgs& other) = default;
+  MouseWheelEventArgs& operator=(MouseWheelEventArgs&& other) = default;
+  ~MouseWheelEventArgs() override = default;
+
+  // Positive means down; Negative means up.
+  float GetDelta() const { return delta_; }
+  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
+
+ private:
+  float delta_;
+  platform::gui::KeyModifier key_modifier_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/PaintEventArgs.hpp b/include/cru/ui/events/PaintEventArgs.hpp
new file mode 100644
index 00000000..8bcb1590
--- /dev/null
+++ b/include/cru/ui/events/PaintEventArgs.hpp
@@ -0,0 +1,25 @@
+#pragma once
+#include "UiEventArgs.hpp"
+
+namespace cru::platform::graphics {
+struct IPainter;
+}
+
+namespace cru::ui::events {
+class PaintEventArgs : public UiEventArgs {
+ public:
+  PaintEventArgs(Object* sender, Object* original_sender,
+                 platform::graphics::IPainter* painter)
+      : UiEventArgs(sender, original_sender), painter_(painter) {}
+  PaintEventArgs(const PaintEventArgs& other) = default;
+  PaintEventArgs(PaintEventArgs&& other) = default;
+  PaintEventArgs& operator=(const PaintEventArgs& other) = default;
+  PaintEventArgs& operator=(PaintEventArgs&& other) = default;
+  ~PaintEventArgs() = default;
+
+  platform::graphics::IPainter* GetPainter() const { return painter_; }
+
+ private:
+  platform::graphics::IPainter* painter_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/RoutedEvent.hpp b/include/cru/ui/events/RoutedEvent.hpp
new file mode 100644
index 00000000..0cedc671
--- /dev/null
+++ b/include/cru/ui/events/RoutedEvent.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#include "UiEventArgs.hpp"
+
+#include "cru/common/Event.hpp"
+
+namespace cru::ui::events {
+// TEventArgs must not be a reference type. This class help add reference.
+// EventArgs must be reference because the IsHandled property must be settable.
+template <typename TEventArgs>
+class RoutedEvent {
+ public:
+  static_assert(std::is_base_of_v<UiEventArgs, TEventArgs>,
+                "TEventArgs must be subclass of UiEventArgs.");
+  static_assert(!std::is_reference_v<TEventArgs>,
+                "TEventArgs must not be reference.");
+
+  using RawEventArgs = TEventArgs;
+  using IEventType = IEvent<TEventArgs&>;
+  using EventArgs = typename IEventType::EventArgs;
+
+  RoutedEvent() = default;
+  RoutedEvent(const RoutedEvent& other) = delete;
+  RoutedEvent(RoutedEvent&& other) = delete;
+  RoutedEvent& operator=(const RoutedEvent& other) = delete;
+  RoutedEvent& operator=(RoutedEvent&& other) = delete;
+  ~RoutedEvent() = default;
+
+  IEvent<TEventArgs&>* Direct() { return &direct_; }
+
+  IEvent<TEventArgs&>* Bubble() { return &bubble_; }
+
+  IEvent<TEventArgs&>* Tunnel() { return &tunnel_; }
+
+ private:
+  Event<TEventArgs&> direct_;
+  Event<TEventArgs&> bubble_;
+  Event<TEventArgs&> tunnel_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/UiEvent.hpp b/include/cru/ui/events/UiEvent.hpp
deleted file mode 100644
index 33bc0a60..00000000
--- a/include/cru/ui/events/UiEvent.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-#pragma once
-#include "../Base.hpp"
-
-#include "cru/common/Event.hpp"
-#include "cru/platform/gui/Keyboard.hpp"
-
-#include <memory>
-#include <optional>
-#include <string>
-#include <type_traits>
-
-namespace cru::platform::graphics {
-struct IPainter;
-}
-
-namespace cru::ui::event {
-class UiEventArgs : public Object {
- public:
-  UiEventArgs(Object* sender, Object* original_sender)
-      : sender_(sender), original_sender_(original_sender), handled_(false) {}
-
-  UiEventArgs(const UiEventArgs& other) = default;
-  UiEventArgs(UiEventArgs&& other) = default;
-  UiEventArgs& operator=(const UiEventArgs& other) = default;
-  UiEventArgs& operator=(UiEventArgs&& other) = default;
-  ~UiEventArgs() override = default;
-
-  Object* GetSender() const { return sender_; }
-
-  Object* GetOriginalSender() const { return original_sender_; }
-
-  bool IsHandled() const { return handled_; }
-  void SetHandled(const bool handled = true) { handled_ = handled; }
-
- private:
-  Object* sender_;
-  Object* original_sender_;
-  bool handled_;
-};
-
-// TEventArgs must not be a reference type. This class help add reference.
-// EventArgs must be reference because the IsHandled property must be settable.
-template <typename TEventArgs>
-class RoutedEvent {
- public:
-  static_assert(std::is_base_of_v<UiEventArgs, TEventArgs>,
-                "TEventArgs must be subclass of UiEventArgs.");
-  static_assert(!std::is_reference_v<TEventArgs>,
-                "TEventArgs must not be reference.");
-
-  using RawEventArgs = TEventArgs;
-  using IEventType = IEvent<TEventArgs&>;
-  using EventArgs = typename IEventType::EventArgs;
-
-  RoutedEvent() = default;
-  RoutedEvent(const RoutedEvent& other) = delete;
-  RoutedEvent(RoutedEvent&& other) = delete;
-  RoutedEvent& operator=(const RoutedEvent& other) = delete;
-  RoutedEvent& operator=(RoutedEvent&& other) = delete;
-  ~RoutedEvent() = default;
-
-  IEvent<TEventArgs&>* Direct() { return &direct_; }
-
-  IEvent<TEventArgs&>* Bubble() { return &bubble_; }
-
-  IEvent<TEventArgs&>* Tunnel() { return &tunnel_; }
-
- private:
-  Event<TEventArgs&> direct_;
-  Event<TEventArgs&> bubble_;
-  Event<TEventArgs&> tunnel_;
-};
-
-class MouseEventArgs : public UiEventArgs {
- public:
-  MouseEventArgs(Object* sender, Object* original_sender,
-                 const std::optional<Point>& point = std::nullopt)
-      : UiEventArgs(sender, original_sender), point_(point) {}
-  MouseEventArgs(const MouseEventArgs& other) = default;
-  MouseEventArgs(MouseEventArgs&& other) = default;
-  MouseEventArgs& operator=(const MouseEventArgs& other) = default;
-  MouseEventArgs& operator=(MouseEventArgs&& other) = default;
-  ~MouseEventArgs() override = default;
-
-  // This point is relative to window client lefttop.
-  Point GetPoint() const { return point_.value_or(Point{}); }
-  Point GetPoint(render::RenderObject* render_target) const;
-  Point GetPointToContent(render::RenderObject* render_target) const;
-
- private:
-  std::optional<Point> point_;
-};
-
-class MouseButtonEventArgs : public MouseEventArgs {
- public:
-  MouseButtonEventArgs(Object* sender, Object* original_sender,
-                       const Point& point, const MouseButton button,
-                       platform::gui::KeyModifier key_modifier)
-      : MouseEventArgs(sender, original_sender, point),
-        button_(button),
-        key_modifier_(key_modifier) {}
-  MouseButtonEventArgs(Object* sender, Object* original_sender,
-                       const MouseButton button,
-                       platform::gui::KeyModifier key_modifier)
-      : MouseEventArgs(sender, original_sender),
-        button_(button),
-        key_modifier_(key_modifier) {}
-  MouseButtonEventArgs(const MouseButtonEventArgs& other) = default;
-  MouseButtonEventArgs(MouseButtonEventArgs&& other) = default;
-  MouseButtonEventArgs& operator=(const MouseButtonEventArgs& other) = default;
-  MouseButtonEventArgs& operator=(MouseButtonEventArgs&& other) = default;
-  ~MouseButtonEventArgs() override = default;
-
-  MouseButton GetButton() const { return button_; }
-  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
-
- private:
-  MouseButton button_;
-  platform::gui::KeyModifier key_modifier_;
-};
-
-class MouseWheelEventArgs : public MouseEventArgs {
- public:
-  MouseWheelEventArgs(Object* sender, Object* original_sender,
-                      const Point& point, const float delta,
-                      platform::gui::KeyModifier key_modifier)
-      : MouseEventArgs(sender, original_sender, point),
-        delta_(delta),
-        key_modifier_(key_modifier) {}
-  MouseWheelEventArgs(const MouseWheelEventArgs& other) = default;
-  MouseWheelEventArgs(MouseWheelEventArgs&& other) = default;
-  MouseWheelEventArgs& operator=(const MouseWheelEventArgs& other) = default;
-  MouseWheelEventArgs& operator=(MouseWheelEventArgs&& other) = default;
-  ~MouseWheelEventArgs() override = default;
-
-  // Positive means down; Negative means up.
-  float GetDelta() const { return delta_; }
-  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
-
- private:
-  float delta_;
-  platform::gui::KeyModifier key_modifier_;
-};
-
-class PaintEventArgs : public UiEventArgs {
- public:
-  PaintEventArgs(Object* sender, Object* original_sender,
-                 platform::graphics::IPainter* painter)
-      : UiEventArgs(sender, original_sender), painter_(painter) {}
-  PaintEventArgs(const PaintEventArgs& other) = default;
-  PaintEventArgs(PaintEventArgs&& other) = default;
-  PaintEventArgs& operator=(const PaintEventArgs& other) = default;
-  PaintEventArgs& operator=(PaintEventArgs&& other) = default;
-  ~PaintEventArgs() = default;
-
-  platform::graphics::IPainter* GetPainter() const { return painter_; }
-
- private:
-  platform::graphics::IPainter* painter_;
-};
-
-class FocusChangeEventArgs : public UiEventArgs {
- public:
-  FocusChangeEventArgs(Object* sender, Object* original_sender,
-                       const bool is_window = false)
-      : UiEventArgs(sender, original_sender), is_window_(is_window) {}
-  FocusChangeEventArgs(const FocusChangeEventArgs& other) = default;
-  FocusChangeEventArgs(FocusChangeEventArgs&& other) = default;
-  FocusChangeEventArgs& operator=(const FocusChangeEventArgs& other) = default;
-  FocusChangeEventArgs& operator=(FocusChangeEventArgs&& other) = default;
-  ~FocusChangeEventArgs() override = default;
-
-  // Return whether the focus change is caused by the window-wide focus change.
-  bool IsWindow() const { return is_window_; }
-
- private:
-  bool is_window_;
-};
-
-/*
-class ToggleEventArgs : public UiEventArgs {
- public:
-  ToggleEventArgs(Object* sender, Object* original_sender, bool new_state)
-      : UiEventArgs(sender, original_sender), new_state_(new_state) {}
-  ToggleEventArgs(const ToggleEventArgs& other) = default;
-  ToggleEventArgs(ToggleEventArgs&& other) = default;
-  ToggleEventArgs& operator=(const ToggleEventArgs& other) = default;
-  ToggleEventArgs& operator=(ToggleEventArgs&& other) = default;
-  ~ToggleEventArgs() override = default;
-
-  bool GetNewState() const { return new_state_; }
-
- private:
-  bool new_state_;
-};
-*/
-
-class KeyEventArgs : public UiEventArgs {
- public:
-  KeyEventArgs(Object* sender, Object* original_sender,
-               platform::gui::KeyCode key_code,
-               platform::gui::KeyModifier key_modifier)
-      : UiEventArgs(sender, original_sender),
-        key_code_(key_code),
-        key_modifier_(key_modifier) {}
-  KeyEventArgs(const KeyEventArgs& other) = default;
-  KeyEventArgs(KeyEventArgs&& other) = default;
-  KeyEventArgs& operator=(const KeyEventArgs& other) = default;
-  KeyEventArgs& operator=(KeyEventArgs&& other) = default;
-  ~KeyEventArgs() override = default;
-
-  platform::gui::KeyCode GetKeyCode() const { return key_code_; }
-  platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
-
- private:
-  platform::gui::KeyCode key_code_;
-  platform::gui::KeyModifier key_modifier_;
-};
-
-class CharEventArgs : public UiEventArgs {
- public:
-  CharEventArgs(Object* sender, Object* original_sender, std::u16string c)
-      : UiEventArgs(sender, original_sender), c_(std::move(c)) {}
-  CharEventArgs(const CharEventArgs& other) = default;
-  CharEventArgs(CharEventArgs&& other) = default;
-  CharEventArgs& operator=(const CharEventArgs& other) = default;
-  CharEventArgs& operator=(CharEventArgs&& other) = default;
-  ~CharEventArgs() override = default;
-
-  std::u16string GetChar() const { return c_; }
-
- private:
-  std::u16string c_;
-};
-}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/UiEventArgs.hpp b/include/cru/ui/events/UiEventArgs.hpp
new file mode 100644
index 00000000..d1b44940
--- /dev/null
+++ b/include/cru/ui/events/UiEventArgs.hpp
@@ -0,0 +1,28 @@
+#pragma once
+#include "../Base.hpp"
+
+namespace cru::ui::events {
+class UiEventArgs : public Object {
+ public:
+  UiEventArgs(Object* sender, Object* original_sender)
+      : sender_(sender), original_sender_(original_sender), handled_(false) {}
+
+  UiEventArgs(const UiEventArgs& other) = default;
+  UiEventArgs(UiEventArgs&& other) = default;
+  UiEventArgs& operator=(const UiEventArgs& other) = default;
+  UiEventArgs& operator=(UiEventArgs&& other) = default;
+  ~UiEventArgs() override = default;
+
+  Object* GetSender() const { return sender_; }
+
+  Object* GetOriginalSender() const { return original_sender_; }
+
+  bool IsHandled() const { return handled_; }
+  void SetHandled(const bool handled = true) { handled_ = handled; }
+
+ private:
+  Object* sender_;
+  Object* original_sender_;
+  bool handled_;
+};
+}  // namespace cru::ui::event
diff --git a/include/cru/ui/events/UiEvents.hpp b/include/cru/ui/events/UiEvents.hpp
new file mode 100644
index 00000000..bd6f7d2a
--- /dev/null
+++ b/include/cru/ui/events/UiEvents.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "FocusChangeEventArgs.hpp"
+#include "KeyEventArgs.hpp"
+#include "MouseButtonEventArgs.hpp"
+#include "MouseEventArgs.hpp"
+#include "MouseWheelEventArgs.hpp"
+#include "PaintEventArgs.hpp"
+#include "RoutedEvent.hpp"
+#include "UiEventArgs.hpp"
diff --git a/include/cru/ui/helper/ShortcutHub.hpp b/include/cru/ui/helper/ShortcutHub.hpp
index 5b9612ba..def024a8 100644
--- a/include/cru/ui/helper/ShortcutHub.hpp
+++ b/include/cru/ui/helper/ShortcutHub.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.hpp"
 
-#include "../events/UiEvent.hpp"
+#include "../events/UiEvents.hpp"
 #include "cru/common/Event.hpp"
 #include "cru/platform/gui/Keyboard.hpp"
 
@@ -120,13 +120,13 @@ class ShortcutHub : public Object {
   const std::vector<ShortcutInfo>& GetShortcutByKeyBind(
       const ShortcutKeyBind& key_bind) const;
 
-  IEvent<event::KeyEventArgs&>* FallbackKeyEvent() { return &fallback_event_; }
+  IEvent<events::KeyEventArgs&>* FallbackKeyEvent() { return &fallback_event_; }
 
   void Install(controls::Control* control);
   void Uninstall();
 
  private:
-  void OnKeyDown(event::KeyEventArgs& event);
+  void OnKeyDown(events::KeyEventArgs& event);
 
  private:
   std::unordered_map<ShortcutKeyBind, std::vector<ShortcutInfo>> map_;
@@ -135,7 +135,7 @@ class ShortcutHub : public Object {
 
   int current_id_ = 1;
 
-  Event<event::KeyEventArgs&> fallback_event_;
+  Event<events::KeyEventArgs&> fallback_event_;
 
   EventRevokerListGuard event_guard_;
 };