From 2188845a7acffa653015a1000139ec0a9a3984bc Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 8 Nov 2020 17:45:41 +0800
Subject: ...

---
 include/cru/ui/controls/Button.hpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include/cru/ui/controls/Button.hpp')

diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index a4f727d6..e8285507 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -1,8 +1,7 @@
 #pragma once
-#include "../ContentControl.hpp"
-#include "Base.hpp"
+#include "ContentControl.hpp"
 
-#include "../ClickDetector.hpp"
+#include "../helper/ClickDetector.hpp"
 
 namespace cru::ui::controls {
 class Button : public ContentControl {
@@ -37,6 +36,6 @@ class Button : public ContentControl {
 
   ButtonStyle style_;
 
-  ClickDetector click_detector_;
+  helper::ClickDetector click_detector_;
 };
 }  // namespace cru::ui::controls
-- 
cgit v1.2.3


From 460a45df8be4613053c6a097d9c699c70dbe1a2c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 10 Nov 2020 15:03:54 +0800
Subject: ...

---
 include/cru/ui/controls/Button.hpp         |  3 ---
 include/cru/ui/controls/Container.hpp      |  3 ---
 include/cru/ui/controls/ContentControl.hpp | 12 ++++++++++++
 include/cru/ui/controls/FlexLayout.hpp     |  4 ----
 include/cru/ui/controls/StackLayout.hpp    |  4 ----
 src/ui/controls/Button.cpp                 |  9 ++-------
 src/ui/controls/Container.cpp              |  8 +++++---
 src/ui/controls/ContentControl.cpp         | 10 ++++++++--
 src/ui/controls/FlexLayout.cpp             | 11 +----------
 src/ui/controls/StackLayout.cpp            | 15 ++++-----------
 10 files changed, 32 insertions(+), 47 deletions(-)

(limited to 'include/cru/ui/controls/Button.hpp')

diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index e8285507..5619ec89 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -28,9 +28,6 @@ class Button : public ContentControl {
   const ButtonStyle& GetStyle() const { return style_; }
   void SetStyle(ButtonStyle style);
 
- protected:
-  void OnChildChanged(Control* old_child, Control* new_child) override;
-
  private:
   std::unique_ptr<render::BorderRenderObject> render_object_{};
 
diff --git a/include/cru/ui/controls/Container.hpp b/include/cru/ui/controls/Container.hpp
index d9cb8aec..18958837 100644
--- a/include/cru/ui/controls/Container.hpp
+++ b/include/cru/ui/controls/Container.hpp
@@ -19,9 +19,6 @@ class Container : public ContentControl {
 
   render::RenderObject* GetRenderObject() const override;
 
- protected:
-  void OnChildChanged(Control* old_child, Control* new_child) override;
-
  private:
   std::unique_ptr<render::BorderRenderObject> render_object_;
 };
diff --git a/include/cru/ui/controls/ContentControl.hpp b/include/cru/ui/controls/ContentControl.hpp
index 47720a87..1bdaf7e4 100644
--- a/include/cru/ui/controls/ContentControl.hpp
+++ b/include/cru/ui/controls/ContentControl.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include "Control.hpp"
 
+#include "cru/ui/render/RenderObject.hpp"
+
 namespace cru::ui::controls {
 class ContentControl : public Control {
  protected:
@@ -19,8 +21,18 @@ class ContentControl : public Control {
  protected:
   virtual void OnChildChanged(Control* old_child, Control* new_child);
 
+  render::RenderObject* GetContainerRenderObject() const {
+    return container_render_object_;
+  }
+  void SetContainerRenderObject(render::RenderObject* ro) {
+    container_render_object_ = ro;
+  }
+
  private:
   using Control::AddChild;
   using Control::RemoveChild;
+
+ private:
+  render::RenderObject* container_render_object_ = nullptr;
 };
 }  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/FlexLayout.hpp b/include/cru/ui/controls/FlexLayout.hpp
index a6c6a40c..4f6abfdb 100644
--- a/include/cru/ui/controls/FlexLayout.hpp
+++ b/include/cru/ui/controls/FlexLayout.hpp
@@ -34,10 +34,6 @@ class FlexLayout : public LayoutControl {
   FlexChildLayoutData GetChildLayoutData(Control* control);
   void SetChildLayoutData(Control* control, FlexChildLayoutData data);
 
- protected:
-  void OnAddChild(Control* child, Index position) override;
-  void OnRemoveChild(Control* child, Index position) override;
-
  private:
   std::shared_ptr<render::FlexLayoutRenderObject> render_object_;
 };
diff --git a/include/cru/ui/controls/StackLayout.hpp b/include/cru/ui/controls/StackLayout.hpp
index 373b4681..aa9440c2 100644
--- a/include/cru/ui/controls/StackLayout.hpp
+++ b/include/cru/ui/controls/StackLayout.hpp
@@ -21,10 +21,6 @@ class StackLayout : public LayoutControl {
 
   render::RenderObject* GetRenderObject() const override;
 
- protected:
-  void OnAddChild(Control* child, Index position) override;
-  void OnRemoveChild(Control* child, Index position) override;
-
  private:
   std::shared_ptr<render::StackLayoutRenderObject> render_object_;
 };
diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp
index b7407ec2..39c4b961 100644
--- a/src/ui/controls/Button.cpp
+++ b/src/ui/controls/Button.cpp
@@ -31,6 +31,8 @@ Button::Button() : click_detector_(this) {
 
   render_object_ = std::make_unique<render::BorderRenderObject>();
   render_object_->SetAttachedControl(this);
+  SetContainerRenderObject(render_object_.get());
+
   Set(render_object_.get(), style_.normal);
   render_object_->SetBorderEnabled(true);
 
@@ -62,11 +64,4 @@ Button::~Button() = default;
 render::RenderObject* Button::GetRenderObject() const {
   return render_object_.get();
 }
-
-void Button::OnChildChanged(Control* old_child, Control* new_child) {
-  if (old_child != nullptr) render_object_->RemoveChild(0);
-  if (new_child != nullptr)
-    render_object_->AddChild(new_child->GetRenderObject(), 0);
-}
-
 }  // namespace cru::ui::controls
diff --git a/src/ui/controls/Container.cpp b/src/ui/controls/Container.cpp
index 8b15c566..30129f64 100644
--- a/src/ui/controls/Container.cpp
+++ b/src/ui/controls/Container.cpp
@@ -2,17 +2,19 @@
 
 #include "cru/platform/graphics/Factory.hpp"
 #include "cru/ui/render/BorderRenderObject.hpp"
+#include "cru/ui/render/RenderObject.hpp"
 
 namespace cru::ui::controls {
 Container::Container() {
   render_object_ = std::make_unique<render::BorderRenderObject>();
   render_object_->SetBorderEnabled(false);
+  render_object_->SetAttachedControl(this);
+  SetContainerRenderObject(render_object_.get());
 }
 
 Container::~Container() = default;
 
-void Container::OnChildChanged(Control*, Control* new_child) {
-  render_object_->RemoveChild(0);
-  render_object_->AddChild(new_child->GetRenderObject(), 0);
+render::RenderObject* Container::GetRenderObject() const {
+  return render_object_.get();
 }
 }  // namespace cru::ui::controls
diff --git a/src/ui/controls/ContentControl.cpp b/src/ui/controls/ContentControl.cpp
index 653882c0..8c6f0b00 100644
--- a/src/ui/controls/ContentControl.cpp
+++ b/src/ui/controls/ContentControl.cpp
@@ -19,7 +19,13 @@ void ContentControl::SetChild(Control* child) {
 }
 
 void ContentControl::OnChildChanged(Control* old_child, Control* new_child) {
-  CRU_UNUSED(old_child)
-  CRU_UNUSED(new_child)
+  if (container_render_object_) {
+    if (old_child) {
+      container_render_object_->RemoveChild(0);
+    }
+    if (new_child) {
+      container_render_object_->AddChild(new_child->GetRenderObject(), 0);
+    }
+  }
 }
 }  // namespace cru::ui::controls
diff --git a/src/ui/controls/FlexLayout.cpp b/src/ui/controls/FlexLayout.cpp
index 05f6999f..e390241f 100644
--- a/src/ui/controls/FlexLayout.cpp
+++ b/src/ui/controls/FlexLayout.cpp
@@ -8,6 +8,7 @@ using render::FlexLayoutRenderObject;
 FlexLayout::FlexLayout() {
   render_object_.reset(new FlexLayoutRenderObject());
   render_object_->SetAttachedControl(this);
+  SetContainerRenderObject(render_object_.get());
 }
 
 FlexLayout::~FlexLayout() = default;
@@ -68,14 +69,4 @@ void FlexLayout::SetItemCrossAlign(FlexCrossAlignment alignment) {
   if (alignment == GetItemCrossAlign()) return;
   render_object_->SetItemCrossAlign(alignment);
 }
-
-void FlexLayout::OnAddChild(Control* child, const Index position) {
-  render_object_->AddChild(child->GetRenderObject(), position);
-}
-
-void FlexLayout::OnRemoveChild(Control* child, const Index position) {
-  CRU_UNUSED(child)
-
-  render_object_->RemoveChild(position);
-}
 }  // namespace cru::ui::controls
diff --git a/src/ui/controls/StackLayout.cpp b/src/ui/controls/StackLayout.cpp
index ce500b79..89968571 100644
--- a/src/ui/controls/StackLayout.cpp
+++ b/src/ui/controls/StackLayout.cpp
@@ -1,12 +1,15 @@
 #include "cru/ui/controls/StackLayout.hpp"
+#include <memory>
 
 #include "cru/ui/render/StackLayoutRenderObject.hpp"
 
 namespace cru::ui::controls {
 using render::StackLayoutRenderObject;
 
-StackLayout::StackLayout() : render_object_(new StackLayoutRenderObject()) {
+StackLayout::StackLayout() {
+  render_object_ = std::make_unique<StackLayoutRenderObject>();
   render_object_->SetAttachedControl(this);
+  SetContainerRenderObject(render_object_.get());
 }
 
 StackLayout::~StackLayout() = default;
@@ -14,14 +17,4 @@ StackLayout::~StackLayout() = default;
 render::RenderObject* StackLayout::GetRenderObject() const {
   return render_object_.get();
 }
-
-void StackLayout::OnAddChild(Control* child, const Index position) {
-  render_object_->AddChild(child->GetRenderObject(), position);
-}
-
-void StackLayout::OnRemoveChild(Control* child, const Index position) {
-  CRU_UNUSED(child)
-
-  render_object_->RemoveChild(position);
-}
 }  // namespace cru::ui::controls
-- 
cgit v1.2.3


From 0fb7a0e0b2b9e04ca414b1e47c69cc854c79831b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 1 Dec 2020 23:20:01 +0800
Subject: ...

---
 include/cru/common/HandlerRegistry.hpp        | 86 +++++++++++++++++++++++++++
 include/cru/ui/controls/Button.hpp            | 12 +++-
 include/cru/ui/controls/IClickableControl.hpp | 12 ++++
 include/cru/ui/helper/Styler.hpp              | 47 ---------------
 include/cru/ui/style/Styler.hpp               |  0
 include/cru/ui/style/Trigger.hpp              | 75 +++++++++++++++++++++++
 src/ui/CMakeLists.txt                         |  4 +-
 src/ui/helper/Styler.cpp                      | 27 ---------
 src/ui/style/Styler.cpp                       |  0
 src/ui/style/Trigger.cpp                      | 49 +++++++++++++++
 test/common/HandlerRegistryTest.cpp           | 36 +++++++++++
 11 files changed, 271 insertions(+), 77 deletions(-)
 create mode 100644 include/cru/common/HandlerRegistry.hpp
 create mode 100644 include/cru/ui/controls/IClickableControl.hpp
 delete mode 100644 include/cru/ui/helper/Styler.hpp
 create mode 100644 include/cru/ui/style/Styler.hpp
 create mode 100644 include/cru/ui/style/Trigger.hpp
 delete mode 100644 src/ui/helper/Styler.cpp
 create mode 100644 src/ui/style/Styler.cpp
 create mode 100644 src/ui/style/Trigger.cpp
 create mode 100644 test/common/HandlerRegistryTest.cpp

(limited to 'include/cru/ui/controls/Button.hpp')

diff --git a/include/cru/common/HandlerRegistry.hpp b/include/cru/common/HandlerRegistry.hpp
new file mode 100644
index 00000000..bd74a9e0
--- /dev/null
+++ b/include/cru/common/HandlerRegistry.hpp
@@ -0,0 +1,86 @@
+#pragma once
+#include "Base.hpp"
+
+#include <algorithm>
+#include <functional>
+#include <utility>
+#include <vector>
+
+namespace cru {
+
+template <typename T>
+class HandlerRegistryIterator {
+ public:
+  using RawIterator =
+      typename std::vector<std::pair<int, std::function<T>>>::const_iterator;
+
+  explicit HandlerRegistryIterator(RawIterator raw) : raw_(std::move(raw)) {}
+
+  CRU_DELETE_COPY(HandlerRegistryIterator)
+  CRU_DELETE_MOVE(HandlerRegistryIterator)
+
+  ~HandlerRegistryIterator() = default;
+
+  const std::function<T>& operator*() const { return raw_->second; }
+  const std::function<T>* operator->() const { return &raw_->second; }
+
+  HandlerRegistryIterator& operator++() {
+    ++raw_;
+    return *this;
+  }
+
+  HandlerRegistryIterator operator++(int) {
+    auto c = *this;
+    this->operator++();
+    return c;
+  }
+
+  bool operator==(const HandlerRegistryIterator<T>& other) const {
+    return this->raw_ == other.raw_;
+  }
+
+  bool operator!=(const HandlerRegistryIterator<T>& other) const {
+    return !this->operator==(other);
+  }
+
+ private:
+  RawIterator raw_;
+};
+
+template <typename T>
+class HandlerRegistry final {
+ public:
+  HandlerRegistry() = default;
+  CRU_DEFAULT_COPY(HandlerRegistry)
+  CRU_DEFAULT_MOVE(HandlerRegistry)
+  ~HandlerRegistry() = default;
+
+ public:
+  int AddHandler(std::function<T> handler) {
+    auto id = current_id_++;
+    handler_list_.push_back({id, std::move(handler)});
+  }
+
+  void RemoveHandler(int id) {
+    auto result = std::find_if(handler_list_.cbegin(), handler_list_.cend(),
+                               [id](const std::pair<int, std::function<T>>& d) {
+                                 return d.first == id;
+                               });
+    if (result != handler_list_.cend()) {
+      handler_list_.erase(result);
+    }
+  }
+
+  HandlerRegistryIterator<T> begin() const {
+    return HandlerRegistryIterator<T>(handler_list_.begin());
+  }
+
+  HandlerRegistryIterator<T> end() const {
+    return HandlerRegistryIterator<T>(handler_list_.begin());
+  }
+
+ private:
+  int current_id_ = 1;
+  std::vector<std::pair<int, std::function<T>>> handler_list_;
+};
+}  // namespace cru
diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index 5619ec89..0d2f4898 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -2,9 +2,11 @@
 #include "ContentControl.hpp"
 
 #include "../helper/ClickDetector.hpp"
+#include "IClickableControl.hpp"
+#include "cru/common/Event.hpp"
 
 namespace cru::ui::controls {
-class Button : public ContentControl {
+class Button : public ContentControl, public virtual IClickableControl {
  public:
   static constexpr std::u16string_view control_type = u"Button";
 
@@ -25,6 +27,14 @@ class Button : public ContentControl {
   render::RenderObject* GetRenderObject() const override;
 
  public:
+  helper::ClickState GetClickState() override {
+    return click_detector_.GetState();
+  }
+
+  IEvent<helper::ClickState>* ClickStateChangeEvent() override {
+    return click_detector_.StateChangeEvent();
+  }
+
   const ButtonStyle& GetStyle() const { return style_; }
   void SetStyle(ButtonStyle style);
 
diff --git a/include/cru/ui/controls/IClickableControl.hpp b/include/cru/ui/controls/IClickableControl.hpp
new file mode 100644
index 00000000..aa7f13ab
--- /dev/null
+++ b/include/cru/ui/controls/IClickableControl.hpp
@@ -0,0 +1,12 @@
+#pragma once
+#include "Base.hpp"
+
+#include "cru/common/Event.hpp"
+#include "cru/ui/helper/ClickDetector.hpp"
+
+namespace cru::ui::controls {
+struct IClickableControl : virtual Interface {
+  virtual helper::ClickState GetClickState() = 0;
+  virtual IEvent<helper::ClickState>* ClickStateChangeEvent() = 0;
+};
+}  // namespace cru::ui::controls
diff --git a/include/cru/ui/helper/Styler.hpp b/include/cru/ui/helper/Styler.hpp
deleted file mode 100644
index ed8bfbdc..00000000
--- a/include/cru/ui/helper/Styler.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/ui/Base.hpp"
-#include "cru/ui/helper/ClickDetector.hpp"
-#include "gsl/pointers"
-
-#include <memory>
-
-namespace cru::ui::helper {
-struct ControlStyleState {
-  ClickState click_state;
-  bool focus;
-};
-
-class Styler : public Object {
- public:
-  // You could provide your click detector. Otherwise a new one will be created.
-  explicit Styler(gsl::not_null<controls::Control*> control,
-                  ClickDetector* click_detector = nullptr);
-
-  CRU_DELETE_COPY(Styler)
-  CRU_DELETE_MOVE(Styler)
-
-  ~Styler();
-
- public:
-  gsl::not_null<controls::Control*> GetControl() const { return control_; }
-  gsl::not_null<ClickDetector*> GetClickDetector() const {
-    return click_detector_;
-  }
-
-  IEvent<ControlStyleState>* StateChangeEvent() { return &state_change_event_; }
-
- private:
-  void RaiseStateChangeEvent();
-
- private:
-  gsl::not_null<controls::Control*> control_;
-  std::unique_ptr<ClickDetector> managed_click_detector_;
-  gsl::not_null<ClickDetector*> click_detector_;
-
-  Event<ControlStyleState> state_change_event_;
-
-  EventRevokerListGuard event_guard_;
-};
-}  // namespace cru::ui::helper
diff --git a/include/cru/ui/style/Styler.hpp b/include/cru/ui/style/Styler.hpp
new file mode 100644
index 00000000..e69de29b
diff --git a/include/cru/ui/style/Trigger.hpp b/include/cru/ui/style/Trigger.hpp
new file mode 100644
index 00000000..ab012a3e
--- /dev/null
+++ b/include/cru/ui/style/Trigger.hpp
@@ -0,0 +1,75 @@
+#pragma once
+#include "../Base.hpp"
+#include "cru/common/Base.hpp"
+#include "cru/common/Event.hpp"
+#include "cru/ui/controls/IClickableControl.hpp"
+#include "cru/ui/helper/ClickDetector.hpp"
+
+#include <utility>
+#include <vector>
+
+namespace cru::ui::style {
+class Trigger {
+ public:
+  virtual ~Trigger() = default;
+
+  bool GetState() const { return current_; }
+  IEvent<bool>* ChangeEvent() { return &change_event_; }
+
+ protected:
+  void Raise(bool value);
+
+ private:
+  bool current_ = false;
+  Event<bool> change_event_;
+
+ protected:
+  EventRevokerListGuard guard_;
+};
+
+class CompoundTrigger : public Trigger {
+ public:
+  explicit CompoundTrigger(std::vector<Trigger*> triggers);
+
+  const std::vector<Trigger*>& GetTriggers() const { return triggers_; }
+
+ protected:
+  virtual bool CalculateState(const std::vector<Trigger*>& triggers) const = 0;
+
+ private:
+  std::vector<Trigger*> triggers_;
+};
+
+class AndTrigger : public CompoundTrigger {
+ public:
+  using CompoundTrigger::CompoundTrigger;
+
+ protected:
+  bool CalculateState(const std::vector<Trigger*>& triggers) const override;
+};
+
+class OrTrigger : public CompoundTrigger {
+ public:
+  using CompoundTrigger::CompoundTrigger;
+
+ protected:
+  bool CalculateState(const std::vector<Trigger*>& triggers) const override;
+};
+
+class FocusTrigger : public Trigger {
+ public:
+  FocusTrigger(controls::Control* control, bool has_focus);
+
+ private:
+  bool has_focus_;
+};
+
+class ClickStateTrigger : public Trigger {
+ public:
+  ClickStateTrigger(controls::IClickableControl* control,
+                    helper::ClickState click_state);
+
+ private:
+  helper::ClickState click_state_;
+};
+}  // namespace cru::ui::style
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 974a3959..5cb50ce3 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -24,7 +24,6 @@ add_library(cru_ui STATIC
 	helper/BorderStyle.cpp
 	helper/ClickDetector.cpp
 	helper/ShortcutHub.cpp
-	helper/Styler.cpp
 	host/LayoutPaintCycler.cpp
 	host/WindowHost.cpp
 	render/BorderRenderObject.cpp
@@ -35,6 +34,7 @@ add_library(cru_ui STATIC
 	render/ScrollRenderObject.cpp
 	render/StackLayoutRenderObject.cpp
 	render/TextRenderObject.cpp
+	style/Trigger.cpp
 )
 target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/Base.hpp
@@ -58,7 +58,6 @@ target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/helper/BorderStyle.hpp
 	${CRU_UI_INCLUDE_DIR}/helper/ClickDetector.hpp
 	${CRU_UI_INCLUDE_DIR}/helper/ShortcutHub.hpp
-	${CRU_UI_INCLUDE_DIR}/helper/Styler.hpp
 	${CRU_UI_INCLUDE_DIR}/host/LayoutPaintCycler.hpp
 	${CRU_UI_INCLUDE_DIR}/host/WindowHost.hpp
 	${CRU_UI_INCLUDE_DIR}/render/Base.hpp
@@ -72,5 +71,6 @@ target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/render/ScrollRenderObject.hpp
 	${CRU_UI_INCLUDE_DIR}/render/StackLayoutRenderObject.hpp
 	${CRU_UI_INCLUDE_DIR}/render/TextRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/style/Trigger.hpp
 )
 target_link_libraries(cru_ui PUBLIC cru_platform_gui)
diff --git a/src/ui/helper/Styler.cpp b/src/ui/helper/Styler.cpp
deleted file mode 100644
index 6500a3f7..00000000
--- a/src/ui/helper/Styler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "cru/ui/helper/Styler.hpp"
-#include "cru/ui/helper/ClickDetector.hpp"
-#include "gsl/pointers"
-
-namespace cru::ui::helper {
-Styler::Styler(gsl::not_null<controls::Control*> control,
-               ClickDetector* click_detector)
-    : control_(control),
-      managed_click_detector_(click_detector ? nullptr
-                                             : new ClickDetector(control)),
-      click_detector_(click_detector ? click_detector
-                                     : managed_click_detector_.get()) {
-  event_guard_ += control_->GainFocusEvent()->Direct()->AddHandler(
-      [this](auto) { this->RaiseStateChangeEvent(); });
-  event_guard_ += control_->LoseFocusEvent()->Direct()->AddHandler(
-      [this](auto) { this->RaiseStateChangeEvent(); });
-  event_guard_ += click_detector_->StateChangeEvent()->AddHandler(
-      [this](auto) { this->RaiseStateChangeEvent(); });
-}
-
-Styler::~Styler() = default;
-
-void Styler::RaiseStateChangeEvent() {
-  this->state_change_event_.Raise(ControlStyleState{
-      this->click_detector_->GetState(), this->control_->HasFocus()});
-}
-}  // namespace cru::ui::helper
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/ui/style/Trigger.cpp b/src/ui/style/Trigger.cpp
new file mode 100644
index 00000000..b7292ce3
--- /dev/null
+++ b/src/ui/style/Trigger.cpp
@@ -0,0 +1,49 @@
+#include "cru/ui/style/Trigger.hpp"
+
+#include "cru/ui/controls/Control.hpp"
+#include "cru/ui/helper/ClickDetector.hpp"
+
+namespace cru::ui::style {
+void Trigger::Raise(bool value) {
+  if (value == current_) return;
+  current_ = value;
+  change_event_.Raise(value);
+}
+
+CompoundTrigger::CompoundTrigger(std::vector<Trigger*> triggers)
+    : triggers_(std::move(triggers)) {
+  for (auto trigger : triggers_) {
+    guard_ += trigger->ChangeEvent()->AddHandler(
+        [this](bool) { Raise(this->CalculateState(triggers_)); });
+  }
+}
+
+bool AndTrigger::CalculateState(const std::vector<Trigger*>& triggers) const {
+  for (auto trigger : triggers) {
+    if (!trigger->GetState()) return false;
+  }
+  return true;
+}
+
+bool OrTrigger::CalculateState(const std::vector<Trigger*>& triggers) const {
+  for (auto trigger : triggers) {
+    if (trigger->GetState()) return true;
+  }
+  return false;
+}
+
+FocusTrigger::FocusTrigger(controls::Control* control, bool has_focus)
+    : has_focus_(has_focus) {
+  guard_ += control->GainFocusEvent()->Direct()->AddHandler(
+      [this](auto) { Raise(has_focus_); });
+  guard_ += control->LoseFocusEvent()->Direct()->AddHandler(
+      [this](auto) { Raise(!has_focus_); });
+}
+
+ClickStateTrigger::ClickStateTrigger(controls::IClickableControl* control,
+                                     helper::ClickState click_state)
+    : click_state_(click_state) {
+  guard_ += control->ClickStateChangeEvent()->AddHandler(
+      [this](helper::ClickState cs) { Raise(cs == click_state_); });
+}
+}  // namespace cru::ui::style
diff --git a/test/common/HandlerRegistryTest.cpp b/test/common/HandlerRegistryTest.cpp
new file mode 100644
index 00000000..d1792c7c
--- /dev/null
+++ b/test/common/HandlerRegistryTest.cpp
@@ -0,0 +1,36 @@
+#include "cru/common/HandlerRegistry.hpp"
+
+#include <gtest/gtest.h>
+#include <algorithm>
+
+TEST(HandlerRegistry, Work) {
+  using namespace cru;
+  HandlerRegistry<void()> registry;
+
+  int counter = 1;
+
+  auto tag1 = registry.AddHandler([&counter] { counter++; });
+  auto tag2 = registry.AddHandler([&counter] { counter++; });
+
+  for (const auto& handler : registry) {
+    handler();
+  }
+
+  ASSERT_EQ(counter, 3);
+
+  registry.RemoveHandler(tag1);
+
+  for (const auto& handler : registry) {
+    handler();
+  }
+
+  ASSERT_EQ(counter, 4);
+
+  registry.RemoveHandler(tag2);
+
+  for (const auto& handler : registry) {
+    handler();
+  }
+
+  ASSERT_EQ(counter, 4);
+}
-- 
cgit v1.2.3


From d7dca1be0dd0814e30fa63924a20af3d924e974c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 2 Dec 2020 19:38:25 +0800
Subject: ...

---
 include/cru/ui/controls/Button.hpp            |  8 +++++++-
 include/cru/ui/controls/IBorderControl.hpp    | 10 ++++++++++
 include/cru/ui/render/BorderRenderObject.hpp  |  4 ++++
 include/cru/ui/style/ApplyBorderStyleInfo.hpp | 12 ++++++++++++
 include/cru/ui/style/Condition.hpp            |  4 +---
 include/cru/ui/style/Styler.hpp               | 13 +++++++++++++
 src/ui/CMakeLists.txt                         |  5 +++++
 src/ui/controls/Button.cpp                    |  4 ++++
 src/ui/render/BorderRenderObject.cpp          | 18 +++++++++++++++---
 9 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 include/cru/ui/controls/IBorderControl.hpp
 create mode 100644 include/cru/ui/style/ApplyBorderStyleInfo.hpp

(limited to 'include/cru/ui/controls/Button.hpp')

diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index 0d2f4898..7299c146 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -2,11 +2,15 @@
 #include "ContentControl.hpp"
 
 #include "../helper/ClickDetector.hpp"
+#include "IBorderControl.hpp"
 #include "IClickableControl.hpp"
 #include "cru/common/Event.hpp"
+#include "cru/ui/style/ApplyBorderStyleInfo.hpp"
 
 namespace cru::ui::controls {
-class Button : public ContentControl, public virtual IClickableControl {
+class Button : public ContentControl,
+               public virtual IClickableControl,
+               public virtual IBorderControl {
  public:
   static constexpr std::u16string_view control_type = u"Button";
 
@@ -35,6 +39,8 @@ class Button : public ContentControl, public virtual IClickableControl {
     return click_detector_.StateChangeEvent();
   }
 
+  void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) override;
+
   const ButtonStyle& GetStyle() const { return style_; }
   void SetStyle(ButtonStyle style);
 
diff --git a/include/cru/ui/controls/IBorderControl.hpp b/include/cru/ui/controls/IBorderControl.hpp
new file mode 100644
index 00000000..817305ef
--- /dev/null
+++ b/include/cru/ui/controls/IBorderControl.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include "../style/ApplyBorderStyleInfo.hpp"
+#include "Base.hpp"
+#include "cru/common/Base.hpp"
+
+namespace cru::ui::controls {
+struct IBorderControl : virtual Interface {
+  virtual void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) = 0;
+};
+}  // namespace cru::ui::controls
diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index f1b957cf..ec0bd52b 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -1,5 +1,7 @@
 #pragma once
+#include "../style/ApplyBorderStyleInfo.hpp"
 #include "RenderObject.hpp"
+#include "cru/ui/Base.hpp"
 
 namespace cru::ui::render {
 class BorderRenderObject : public RenderObject {
@@ -64,6 +66,8 @@ class BorderRenderObject : public RenderObject {
 
   void SetBorderStyle(const BorderStyle& style);
 
+  void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style);
+
   RenderObject* HitTest(const Point& point) override;
 
  protected:
diff --git a/include/cru/ui/style/ApplyBorderStyleInfo.hpp b/include/cru/ui/style/ApplyBorderStyleInfo.hpp
new file mode 100644
index 00000000..e9c4ca44
--- /dev/null
+++ b/include/cru/ui/style/ApplyBorderStyleInfo.hpp
@@ -0,0 +1,12 @@
+#pragma once
+#include "../Base.hpp"
+
+namespace cru::ui::style {
+struct ApplyBorderStyleInfo {
+  std::shared_ptr<platform::graphics::IBrush> border_brush;
+  std::optional<Thickness> border_thickness;
+  std::optional<CornerRadius> border_radius;
+  std::shared_ptr<platform::graphics::IBrush> foreground_brush;
+  std::shared_ptr<platform::graphics::IBrush> background_brush;
+};
+}  // namespace cru::ui::style
diff --git a/include/cru/ui/style/Condition.hpp b/include/cru/ui/style/Condition.hpp
index b88a338f..97d29287 100644
--- a/include/cru/ui/style/Condition.hpp
+++ b/include/cru/ui/style/Condition.hpp
@@ -10,10 +10,8 @@
 #include <vector>
 
 namespace cru::ui::style {
-class Condition {
+class Condition : public Object {
  public:
-  virtual ~Condition() = default;
-
   virtual std::vector<IBaseEvent*> ChangeOn(
       controls::Control* control) const = 0;
   virtual bool Judge(controls::Control* control) const = 0;
diff --git a/include/cru/ui/style/Styler.hpp b/include/cru/ui/style/Styler.hpp
index e69de29b..0b48f1ce 100644
--- a/include/cru/ui/style/Styler.hpp
+++ b/include/cru/ui/style/Styler.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include "../Base.hpp"
+#include "cru/common/Base.hpp"
+
+#include <optional>
+
+namespace cru::ui::style {
+class Styler : public Object {
+ public:
+  virtual void Apply(controls::Control* control) const;
+};
+
+}  // namespace cru::ui::style
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 85c87f5e..03297988 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -35,6 +35,7 @@ add_library(cru_ui STATIC
 	render/StackLayoutRenderObject.cpp
 	render/TextRenderObject.cpp
 	style/Condition.cpp
+	style/Styler.cpp
 )
 target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/Base.hpp
@@ -46,6 +47,8 @@ target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/controls/ContentControl.hpp
 	${CRU_UI_INCLUDE_DIR}/controls/Control.hpp
 	${CRU_UI_INCLUDE_DIR}/controls/FlexLayout.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/IBorderControl.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/IClickableControl.hpp
 	${CRU_UI_INCLUDE_DIR}/controls/LayoutControl.hpp
 	${CRU_UI_INCLUDE_DIR}/controls/NoChildControl.hpp
 	${CRU_UI_INCLUDE_DIR}/controls/Popup.hpp
@@ -71,6 +74,8 @@ target_sources(cru_ui PUBLIC
 	${CRU_UI_INCLUDE_DIR}/render/ScrollRenderObject.hpp
 	${CRU_UI_INCLUDE_DIR}/render/StackLayoutRenderObject.hpp
 	${CRU_UI_INCLUDE_DIR}/render/TextRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/style/ApplyBorderStyleInfo.hpp
 	${CRU_UI_INCLUDE_DIR}/style/Condition.hpp
+	${CRU_UI_INCLUDE_DIR}/style/Styler.hpp
 )
 target_link_libraries(cru_ui PUBLIC cru_platform_gui)
diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp
index 39c4b961..6f19e6b9 100644
--- a/src/ui/controls/Button.cpp
+++ b/src/ui/controls/Button.cpp
@@ -64,4 +64,8 @@ Button::~Button() = default;
 render::RenderObject* Button::GetRenderObject() const {
   return render_object_.get();
 }
+
+void Button::ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) {
+  render_object_->ApplyBorderStyle(style);
+}
 }  // namespace cru::ui::controls
diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 8e16d8cb..5abc7832 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -5,6 +5,7 @@
 #include "cru/platform/graphics/Factory.hpp"
 #include "cru/platform/graphics/Geometry.hpp"
 #include "cru/platform/graphics/util/Painter.hpp"
+#include "cru/ui/style/ApplyBorderStyleInfo.hpp"
 
 #include <algorithm>
 
@@ -25,6 +26,16 @@ void BorderRenderObject::SetBorderStyle(const BorderStyle& style) {
   InvalidateLayout();
 }
 
+void BorderRenderObject::ApplyBorderStyle(
+    const style::ApplyBorderStyleInfo& style) {
+  if (style.border_brush != nullptr) border_brush_ = style.border_brush;
+  if (style.border_thickness) border_thickness_ = *style.border_thickness;
+  if (style.border_radius) border_radius_ = *style.border_radius;
+  if (style.foreground_brush) foreground_brush_ = style.foreground_brush;
+  if (style.background_brush) background_brush_ = style.background_brush;
+  InvalidateLayout();
+}
+
 RenderObject* BorderRenderObject::HitTest(const Point& point) {
   if (const auto child = GetSingleChild()) {
     auto offset = child->GetOffset();
@@ -109,9 +120,10 @@ Size BorderRenderObject::OnMeasureCore(const MeasureRequirement& requirement,
   if (!requirement.max.height.IsNotSpecified()) {
     const auto max_height = requirement.max.height.GetLengthOrMax();
     if (coerced_space_size.height > max_height) {
-      log::TagWarn(log_tag,
-                   u"(Measure) Vertical length of padding, border and margin is "
-                   u"bigger than required max length.");
+      log::TagWarn(
+          log_tag,
+          u"(Measure) Vertical length of padding, border and margin is "
+          u"bigger than required max length.");
       coerced_space_size.height = max_height;
     }
     content_requirement.max.height = max_height - coerced_space_size.height;
-- 
cgit v1.2.3


From b29fb11be2f043a3438a50d8942b4ad7d2af0034 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 3 Dec 2020 22:44:57 +0800
Subject: ...

---
 include/cru/common/ClonablePtr.hpp           |  7 ++-
 include/cru/common/Event.hpp                 |  4 +-
 include/cru/ui/Base.hpp                      | 12 ++--
 include/cru/ui/UiManager.hpp                 |  5 +-
 include/cru/ui/controls/Base.hpp             | 22 +------
 include/cru/ui/controls/Button.hpp           |  5 --
 include/cru/ui/controls/Control.hpp          |  5 ++
 include/cru/ui/controls/TextBox.hpp          | 14 +----
 include/cru/ui/helper/ClickDetector.hpp      |  2 +-
 include/cru/ui/render/BorderRenderObject.hpp |  2 -
 include/cru/ui/style/Condition.hpp           | 42 +++++++++++++
 include/cru/ui/style/StyleRuleSet.hpp        | 55 +++++++++++++++++
 include/cru/ui/style/Styler.hpp              |  7 ++-
 src/ui/UiManager.cpp                         | 91 ++++++++++++++++------------
 src/ui/controls/Button.cpp                   | 19 +-----
 src/ui/controls/Control.cpp                  |  7 +++
 src/ui/controls/TextBox.cpp                  | 29 +--------
 src/ui/render/BorderRenderObject.cpp         |  9 ---
 src/ui/style/Condition.cpp                   | 10 +++
 src/ui/style/StyleRuleSet.cpp                | 58 ++++++++++++++++++
 src/win/gui/Window.cpp                       |  2 +-
 21 files changed, 262 insertions(+), 145 deletions(-)

(limited to 'include/cru/ui/controls/Button.hpp')

diff --git a/include/cru/common/ClonablePtr.hpp b/include/cru/common/ClonablePtr.hpp
index 47a1d3bd..5e4b80c9 100644
--- a/include/cru/common/ClonablePtr.hpp
+++ b/include/cru/common/ClonablePtr.hpp
@@ -8,13 +8,16 @@
 namespace cru {
 template <typename TClonable>
 class ClonablePtr {
+  template <typename T>
+  friend class ClonablePtr;
+
  public:
   using element_type = typename std::unique_ptr<TClonable>::element_type;
   using pointer = typename std::unique_ptr<TClonable>::pointer;
 
   ClonablePtr() = default;
   ClonablePtr(std::nullptr_t) noexcept : ptr_(nullptr) {}
-  ClonablePtr(pointer p) noexcept : ptr_(p) {}
+  explicit ClonablePtr(pointer p) noexcept : ptr_(p) {}
   ClonablePtr(std::unique_ptr<element_type>&& p) noexcept
       : ptr_(std::move(p)) {}
   template <typename O,
@@ -52,7 +55,7 @@ class ClonablePtr {
   }
   ClonablePtr& operator=(const ClonablePtr& other) {
     if (this != &other) {
-      ptr_ = std::unique_ptr<element_type>(other.ptr->Clone());
+      ptr_ = std::unique_ptr<element_type>(other.ptr_->Clone());
     }
     return *this;
   }
diff --git a/include/cru/common/Event.hpp b/include/cru/common/Event.hpp
index 59502527..7f7b4dd4 100644
--- a/include/cru/common/Event.hpp
+++ b/include/cru/common/Event.hpp
@@ -98,7 +98,7 @@ struct IBaseEvent {
   using SpyOnlyHandler = std::function<void()>;
 
  public:
-  virtual EventRevoker AddHandler(SpyOnlyHandler handler) = 0;
+  virtual EventRevoker AddSpyOnlyHandler(SpyOnlyHandler handler) = 0;
 };
 
 // Provides an interface of event.
@@ -147,7 +147,7 @@ class Event : public details::EventBase, public IEvent<TEventArgs> {
   CRU_DEFAULT_MOVE(Event)
   ~Event() = default;
 
-  EventRevoker AddHandler(SpyOnlyHandler handler) override {
+  EventRevoker AddSpyOnlyHandler(SpyOnlyHandler handler) override {
     const auto token = current_token_++;
     this->handler_data_list_.emplace_back(token, std::move(handler));
     return CreateRevoker(token);
diff --git a/include/cru/ui/Base.hpp b/include/cru/ui/Base.hpp
index 8595258d..57beb723 100644
--- a/include/cru/ui/Base.hpp
+++ b/include/cru/ui/Base.hpp
@@ -40,6 +40,10 @@ namespace render {
 class RenderObject;
 }
 
+namespace style {
+class StyleRuleSet;
+}
+
 //-------------------- region: basic types --------------------
 namespace internal {
 constexpr int align_start = 0;
@@ -87,14 +91,6 @@ inline bool operator!=(const CornerRadius& left, const CornerRadius& right) {
   return !(left == right);
 }
 
-struct BorderStyle {
-  std::shared_ptr<platform::graphics::IBrush> border_brush;
-  Thickness border_thickness;
-  CornerRadius border_radius;
-  std::shared_ptr<platform::graphics::IBrush> foreground_brush;
-  std::shared_ptr<platform::graphics::IBrush> background_brush;
-};
-
 class CanvasPaintEventArgs {
  public:
   CanvasPaintEventArgs(platform::graphics::IPainter* painter,
diff --git a/include/cru/ui/UiManager.hpp b/include/cru/ui/UiManager.hpp
index 64599d99..e747fcd2 100644
--- a/include/cru/ui/UiManager.hpp
+++ b/include/cru/ui/UiManager.hpp
@@ -2,6 +2,7 @@
 #include "Base.hpp"
 
 #include "controls/Base.hpp"
+#include "style/StyleRuleSet.hpp"
 
 #include <memory>
 #include <string>
@@ -13,8 +14,8 @@ struct ThemeResources {
   std::shared_ptr<platform::graphics::IBrush> text_brush;
   std::shared_ptr<platform::graphics::IBrush> text_selection_brush;
   std::shared_ptr<platform::graphics::IBrush> caret_brush;
-  controls::ButtonStyle button_style;
-  controls::TextBoxBorderStyle text_box_border_style;
+  style::StyleRuleSet button_style;
+  style::StyleRuleSet text_box_style;
 };
 
 class UiManager : public Object {
diff --git a/include/cru/ui/controls/Base.hpp b/include/cru/ui/controls/Base.hpp
index 82c31d1e..7c85cdb2 100644
--- a/include/cru/ui/controls/Base.hpp
+++ b/include/cru/ui/controls/Base.hpp
@@ -1,24 +1,4 @@
 #pragma once
 #include "../Base.hpp"
 
-namespace cru::ui::controls {
-using ButtonStateStyle = ui::BorderStyle;
-
-struct ButtonStyle {
-  // corresponds to ClickState::None
-  ButtonStateStyle normal;
-  // corresponds to ClickState::Hover
-  ButtonStateStyle hover;
-  // corresponds to ClickState::Press
-  ButtonStateStyle press;
-  // corresponds to ClickState::PressInactive
-  ButtonStateStyle press_cancel;
-};
-
-struct TextBoxBorderStyle {
-  ui::BorderStyle normal;
-  ui::BorderStyle hover;
-  ui::BorderStyle focus;
-  ui::BorderStyle focus_hover;
-};
-}  // namespace cru::ui::controls
+namespace cru::ui::controls {}  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index 7299c146..1c9b1216 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -41,14 +41,9 @@ class Button : public ContentControl,
 
   void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) override;
 
-  const ButtonStyle& GetStyle() const { return style_; }
-  void SetStyle(ButtonStyle style);
-
  private:
   std::unique_ptr<render::BorderRenderObject> render_object_{};
 
-  ButtonStyle style_;
-
   helper::ClickDetector click_detector_;
 };
 }  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/Control.hpp b/include/cru/ui/controls/Control.hpp
index 96aad2bd..0d34bc63 100644
--- a/include/cru/ui/controls/Control.hpp
+++ b/include/cru/ui/controls/Control.hpp
@@ -66,6 +66,9 @@ class Control : public Object {
   // null to unset
   void SetCursor(std::shared_ptr<platform::gui::ICursor> cursor);
 
+ public:
+  style::StyleRuleSet* GetStyleRuleSet();
+
   //*************** region: events ***************
  public:
   // Raised when mouse enter the control. Even when the control itself captures
@@ -147,5 +150,7 @@ class Control : public Object {
   bool is_mouse_over_ = false;
 
   std::shared_ptr<platform::gui::ICursor> cursor_ = nullptr;
+
+  std::unique_ptr<style::StyleRuleSet> style_rule_set_;
 };
 }  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/TextBox.hpp b/include/cru/ui/controls/TextBox.hpp
index 91d38c61..75e7cb65 100644
--- a/include/cru/ui/controls/TextBox.hpp
+++ b/include/cru/ui/controls/TextBox.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "NoChildControl.hpp"
+#include "IBorderControl.hpp"
 
 #include <memory>
 
@@ -7,7 +8,7 @@ namespace cru::ui::controls {
 template <typename TControl>
 class TextControlService;
 
-class TextBox : public NoChildControl {
+class TextBox : public NoChildControl, public IBorderControl {
  public:
   static constexpr std::u16string_view control_type = u"TextBox";
 
@@ -29,22 +30,13 @@ class TextBox : public NoChildControl {
   gsl::not_null<render::TextRenderObject*> GetTextRenderObject();
   render::ScrollRenderObject* GetScrollRenderObject();
 
-  const TextBoxBorderStyle& GetBorderStyle();
-  void SetBorderStyle(TextBoxBorderStyle border_style);
-
- protected:
-  void OnMouseHoverChange(bool newHover) override;
-
- private:
-  void UpdateBorderStyle();
+  void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) override;
 
  private:
   std::unique_ptr<render::BorderRenderObject> border_render_object_;
   std::unique_ptr<render::ScrollRenderObject> scroll_render_object_;
   std::unique_ptr<render::TextRenderObject> text_render_object_;
 
-  TextBoxBorderStyle border_style_;
-
   std::unique_ptr<TextControlService<TextBox>> service_;
 };
 }  // namespace cru::ui::controls
diff --git a/include/cru/ui/helper/ClickDetector.hpp b/include/cru/ui/helper/ClickDetector.hpp
index 0df77c60..b58297b1 100644
--- a/include/cru/ui/helper/ClickDetector.hpp
+++ b/include/cru/ui/helper/ClickDetector.hpp
@@ -71,7 +71,7 @@ class ClickDetector : public Object {
  private:
   controls::Control* control_;
 
-  ClickState state_;
+  ClickState state_ = ClickState::None;
 
   bool enable_ = true;
   MouseButton trigger_button_ = mouse_buttons::left | mouse_buttons::right;
diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index ec0bd52b..3d4f4dad 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -64,8 +64,6 @@ class BorderRenderObject : public RenderObject {
     InvalidatePaint();
   }
 
-  void SetBorderStyle(const BorderStyle& style);
-
   void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style);
 
   RenderObject* HitTest(const Point& point) override;
diff --git a/include/cru/ui/style/Condition.hpp b/include/cru/ui/style/Condition.hpp
index 13ab7764..d5cf16f2 100644
--- a/include/cru/ui/style/Condition.hpp
+++ b/include/cru/ui/style/Condition.hpp
@@ -21,6 +21,21 @@ class Condition : public Object {
   virtual Condition* Clone() const = 0;
 };
 
+class NoCondition : public Condition {
+ public:
+  static ClonablePtr<NoCondition> Create() {
+    return ClonablePtr<NoCondition>(new NoCondition);
+  };
+
+  std::vector<IBaseEvent*> ChangeOn(controls::Control*) const override {
+    return {};
+  }
+
+  bool Judge(controls::Control*) const override { return true; }
+
+  NoCondition* Clone() const override { return new NoCondition; }
+};
+
 class CompoundCondition : public Condition {
  public:
   explicit CompoundCondition(std::vector<ClonablePtr<Condition>> conditions);
@@ -51,6 +66,10 @@ class OrCondition : public CompoundCondition {
 
 class FocusCondition : public Condition {
  public:
+  static ClonablePtr<FocusCondition> Create(bool has_focus) {
+    return ClonablePtr<FocusCondition>(new FocusCondition(has_focus));
+  }
+
   explicit FocusCondition(bool has_focus);
 
   std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
@@ -64,8 +83,31 @@ class FocusCondition : public Condition {
   bool has_focus_;
 };
 
+class HoverCondition : public Condition {
+ public:
+  static ClonablePtr<HoverCondition> Create(bool hover) {
+    return ClonablePtr<HoverCondition>(new HoverCondition(hover));
+  }
+
+  explicit HoverCondition(bool hover) : hover_(hover) {}
+
+  std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
+  bool Judge(controls::Control* control) const override;
+
+  HoverCondition* Clone() const override { return new HoverCondition(hover_); }
+
+ private:
+  bool hover_;
+};
+
 class ClickStateCondition : public Condition {
  public:
+  static ClonablePtr<ClickStateCondition> Create(
+      helper::ClickState click_state) {
+    return ClonablePtr<ClickStateCondition>(
+        new ClickStateCondition(click_state));
+  }
+
   explicit ClickStateCondition(helper::ClickState click_state);
 
   std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
diff --git a/include/cru/ui/style/StyleRuleSet.hpp b/include/cru/ui/style/StyleRuleSet.hpp
index e69de29b..3ec71730 100644
--- a/include/cru/ui/style/StyleRuleSet.hpp
+++ b/include/cru/ui/style/StyleRuleSet.hpp
@@ -0,0 +1,55 @@
+#pragma once
+#include "StyleRule.hpp"
+#include "cru/common/Base.hpp"
+#include "cru/common/Event.hpp"
+#include "gsl/gsl_assert"
+
+namespace cru::ui::style {
+class StyleRuleSet : public Object {
+ public:
+  StyleRuleSet() : control_(nullptr) {}
+  explicit StyleRuleSet(controls::Control* control) : control_(control) {}
+
+  CRU_DELETE_COPY(StyleRuleSet)
+  CRU_DELETE_MOVE(StyleRuleSet)
+
+  ~StyleRuleSet() override = default;
+
+ public:
+  gsl::index GetSize() const { return static_cast<gsl::index>(rules_.size()); }
+  const std::vector<StyleRule>& GetRules() const { return rules_; }
+
+  void AddStyleRule(StyleRule rule) {
+    AddStyleRule(std::move(rule), GetSize());
+  }
+
+  void AddStyleRule(StyleRule rule, gsl::index index);
+
+  template <typename Iter>
+  void AddStyleRuleRange(Iter start, Iter end, gsl::index index) {
+    Expects(index >= 0 && index <= GetSize());
+    rules_.insert(rules_.cbegin() + index, std::move(start), std::move(end));
+    UpdateChangeListener();
+    UpdateStyle();
+  }
+
+  void RemoveStyleRule(gsl::index index, gsl::index count = 1);
+
+  void Clear() { RemoveStyleRule(0, GetSize()); }
+
+  void Set(const StyleRuleSet& other);
+
+  const StyleRule& operator[](gsl::index index) const { return rules_[index]; }
+
+ private:
+  void UpdateChangeListener();
+  void UpdateStyle();
+
+ private:
+  controls::Control* control_;
+
+  std::vector<StyleRule> rules_;
+
+  EventRevokerListGuard guard_;
+};
+}  // namespace cru::ui::style
diff --git a/include/cru/ui/style/Styler.hpp b/include/cru/ui/style/Styler.hpp
index 2aece114..10b169b1 100644
--- a/include/cru/ui/style/Styler.hpp
+++ b/include/cru/ui/style/Styler.hpp
@@ -2,19 +2,24 @@
 #include "../Base.hpp"
 #include "ApplyBorderStyleInfo.hpp"
 #include "cru/common/Base.hpp"
+#include "cru/common/ClonablePtr.hpp"
 
 #include <memory>
 
 namespace cru::ui::style {
 class Styler : public Object {
  public:
-  virtual void Apply(controls::Control* control) const;
+  virtual void Apply(controls::Control* control) const = 0;
 
   virtual Styler* Clone() const = 0;
 };
 
 class BorderStyler : public Styler {
  public:
+  static ClonablePtr<BorderStyler> Create(ApplyBorderStyleInfo style) {
+    return ClonablePtr<BorderStyler>(new BorderStyler(std::move(style)));
+  }
+
   explicit BorderStyler(ApplyBorderStyleInfo style);
 
   void Apply(controls::Control* control) const override;
diff --git a/src/ui/UiManager.cpp b/src/ui/UiManager.cpp
index 62995f86..bb7f5841 100644
--- a/src/ui/UiManager.cpp
+++ b/src/ui/UiManager.cpp
@@ -5,9 +5,14 @@
 #include "cru/platform/graphics/Factory.hpp"
 #include "cru/platform/graphics/Font.hpp"
 #include "cru/platform/gui/UiApplication.hpp"
+#include "cru/ui/style/ApplyBorderStyleInfo.hpp"
+#include "cru/ui/style/Condition.hpp"
+#include "cru/ui/style/Styler.hpp"
 
 namespace cru::ui {
 using namespace cru::platform::graphics;
+using namespace cru::ui::style;
+using namespace cru::ui::helper;
 
 namespace {
 std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush(IGraphFactory* factory,
@@ -35,49 +40,59 @@ UiManager::UiManager() {
   theme_resource_.default_font =
       factory->CreateFont(theme_resource_.default_font_family, 24.0f);
 
-  const auto black_brush = std::shared_ptr<platform::graphics::ISolidColorBrush>(
-      CreateSolidColorBrush(factory, colors::black));
+  const auto black_brush =
+      std::shared_ptr<platform::graphics::ISolidColorBrush>(
+          CreateSolidColorBrush(factory, colors::black));
   theme_resource_.text_brush = black_brush;
   theme_resource_.text_selection_brush =
       CreateSolidColorBrush(factory, colors::skyblue);
   theme_resource_.caret_brush = black_brush;
 
-  theme_resource_.button_style.normal.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0x00bfff));
-  theme_resource_.button_style.hover.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0x47d1ff));
-  theme_resource_.button_style.press.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff));
-  theme_resource_.button_style.press_cancel.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff));
-
-  theme_resource_.button_style.normal.border_thickness =
-      theme_resource_.button_style.hover.border_thickness =
-          theme_resource_.button_style.press.border_thickness =
-              theme_resource_.button_style.press_cancel.border_thickness =
-                  Thickness(3);
-
-  theme_resource_.button_style.normal.border_radius =
-      theme_resource_.button_style.hover.border_radius =
-          theme_resource_.button_style.press.border_radius =
-              theme_resource_.button_style.press_cancel.border_radius =
-                  CornerRadius({5, 5});
-
-  theme_resource_.text_box_border_style.normal.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0xced4da));
-  theme_resource_.text_box_border_style.normal.border_radius = CornerRadius(5);
-  theme_resource_.text_box_border_style.normal.border_thickness = Thickness(1);
-
-  theme_resource_.text_box_border_style.hover =
-      theme_resource_.text_box_border_style.normal;
-
-  theme_resource_.text_box_border_style.focus.border_brush =
-      CreateSolidColorBrush(factory, Color::FromHex(0x495057));
-  theme_resource_.text_box_border_style.focus.border_radius = CornerRadius(5);
-  theme_resource_.text_box_border_style.focus.border_thickness = Thickness(1);
-
-  theme_resource_.text_box_border_style.focus_hover =
-      theme_resource_.text_box_border_style.focus;
+  theme_resource_.button_style.AddStyleRule(
+      {ClickStateCondition::Create(ClickState::None),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0x00bfff)),
+           Thickness(3), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultButtonNormal"});
+  theme_resource_.button_style.AddStyleRule(
+      {ClickStateCondition::Create(ClickState::Hover),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0x47d1ff)),
+           Thickness(3), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultButtonHover"});
+  theme_resource_.button_style.AddStyleRule(
+      {ClickStateCondition::Create(ClickState::Press),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff)),
+           Thickness(3), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultButtonPress"});
+  theme_resource_.button_style.AddStyleRule(
+      {ClickStateCondition::Create(ClickState::PressInactive),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff)),
+           Thickness(3), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultButtonPressInactive"});
+
+  theme_resource_.text_box_style.AddStyleRule(
+      {HoverCondition::Create(false),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0xced4da)),
+           Thickness(1), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultTextBoxNormal"});
+
+  theme_resource_.text_box_style.AddStyleRule(
+      {HoverCondition::Create(true),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0xced4da)),
+           Thickness(1), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultTextBoxHover"});
+
+  theme_resource_.text_box_style.AddStyleRule(
+      {FocusCondition::Create(true),
+       BorderStyler::Create(ApplyBorderStyleInfo{
+           CreateSolidColorBrush(factory, Color::FromHex(0x495057)),
+           Thickness(1), CornerRadius(5), nullptr, nullptr}),
+       u"DefaultTextBoxHover"});
 }
 
 UiManager::~UiManager() = default;
diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp
index 6f19e6b9..7858eadb 100644
--- a/src/ui/controls/Button.cpp
+++ b/src/ui/controls/Button.cpp
@@ -13,50 +13,37 @@ namespace cru::ui::controls {
 using cru::platform::gui::SystemCursorType;
 
 namespace {
-void Set(render::BorderRenderObject* o, const ButtonStateStyle& s) {
-  o->SetBorderBrush(s.border_brush);
-  o->SetBorderThickness(s.border_thickness);
-  o->SetBorderRadius(s.border_radius);
-  o->SetForegroundBrush(s.foreground_brush);
-  o->SetBackgroundBrush(s.background_brush);
-}
-
 std::shared_ptr<platform::gui::ICursor> GetSystemCursor(SystemCursorType type) {
   return GetUiApplication()->GetCursorManager()->GetSystemCursor(type);
 }
 }  // namespace
 
 Button::Button() : click_detector_(this) {
-  style_ = UiManager::GetInstance()->GetThemeResources()->button_style;
-
   render_object_ = std::make_unique<render::BorderRenderObject>();
   render_object_->SetAttachedControl(this);
   SetContainerRenderObject(render_object_.get());
-
-  Set(render_object_.get(), style_.normal);
   render_object_->SetBorderEnabled(true);
 
   click_detector_.StateChangeEvent()->AddHandler(
       [this](const helper::ClickState& state) {
         switch (state) {
           case helper::ClickState::None:
-            Set(render_object_.get(), style_.normal);
             SetCursor(GetSystemCursor(SystemCursorType::Arrow));
             break;
           case helper::ClickState::Hover:
-            Set(render_object_.get(), style_.hover);
             SetCursor(GetSystemCursor(SystemCursorType::Hand));
             break;
           case helper::ClickState::Press:
-            Set(render_object_.get(), style_.press);
             SetCursor(GetSystemCursor(SystemCursorType::Hand));
             break;
           case helper::ClickState::PressInactive:
-            Set(render_object_.get(), style_.press_cancel);
             SetCursor(GetSystemCursor(SystemCursorType::Arrow));
             break;
         }
       });
+
+  GetStyleRuleSet()->Set(
+      UiManager::GetInstance()->GetThemeResources()->button_style);
 }
 
 Button::~Button() = default;
diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp
index c1316a62..1c4ffe51 100644
--- a/src/ui/controls/Control.cpp
+++ b/src/ui/controls/Control.cpp
@@ -6,6 +6,7 @@
 #include "cru/ui/Base.hpp"
 #include "cru/ui/host/WindowHost.hpp"
 #include "cru/ui/render/RenderObject.hpp"
+#include "cru/ui/style/StyleRuleSet.hpp"
 
 #include <memory>
 
@@ -15,6 +16,8 @@ using platform::gui::IUiApplication;
 using platform::gui::SystemCursorType;
 
 Control::Control() {
+  style_rule_set_ = std::make_unique<style::StyleRuleSet>(this);
+
   MouseEnterEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) {
     this->is_mouse_over_ = true;
     this->OnMouseHoverChange(true);
@@ -94,6 +97,10 @@ void Control::SetCursor(std::shared_ptr<ICursor> cursor) {
   }
 }
 
+style::StyleRuleSet* Control::GetStyleRuleSet() {
+  return style_rule_set_.get();
+}
+
 void Control::AddChild(Control* control, const Index position) {
   Expects(control->GetParent() ==
           nullptr);  // The control already has a parent.
diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index 6ba6ecb2..031894c0 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -18,8 +18,6 @@ TextBox::TextBox()
       scroll_render_object_(new ScrollRenderObject()) {
   const auto theme_resources = UiManager::GetInstance()->GetThemeResources();
 
-  border_style_ = theme_resources->text_box_border_style;
-
   text_render_object_ = std::make_unique<TextRenderObject>(
       theme_resources->text_brush, theme_resources->default_font,
       theme_resources->text_selection_brush, theme_resources->caret_brush);
@@ -38,17 +36,8 @@ TextBox::TextBox()
   service_->SetEditable(true);
 
   border_render_object_->SetBorderEnabled(true);
-  border_render_object_->SetBorderStyle(border_style_.normal);
-
-  GainFocusEvent()->Direct()->AddHandler([this](event::FocusChangeEventArgs&) {
-    this->service_->SetCaretVisible(true);
-    this->UpdateBorderStyle();
-  });
 
-  LoseFocusEvent()->Direct()->AddHandler([this](event::FocusChangeEventArgs&) {
-    this->service_->SetCaretVisible(false);
-    this->UpdateBorderStyle();
-  });
+  GetStyleRuleSet()->Set(theme_resources->text_box_style);
 }
 
 TextBox::~TextBox() {}
@@ -65,19 +54,7 @@ render::ScrollRenderObject* TextBox::GetScrollRenderObject() {
   return scroll_render_object_.get();
 }
 
-const TextBoxBorderStyle& TextBox::GetBorderStyle() { return border_style_; }
-
-void TextBox::SetBorderStyle(TextBoxBorderStyle border_style) {
-  border_style_ = std::move(border_style);
-}
-
-void TextBox::OnMouseHoverChange(bool) { UpdateBorderStyle(); }
-
-void TextBox::UpdateBorderStyle() {
-  const auto focus = HasFocus();
-  const auto hover = IsMouseOver();
-  border_render_object_->SetBorderStyle(
-      focus ? (hover ? border_style_.focus_hover : border_style_.focus)
-            : (hover ? border_style_.hover : border_style_.normal));
+void TextBox::ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) {
+  border_render_object_->ApplyBorderStyle(style);
 }
 }  // namespace cru::ui::controls
diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 5abc7832..c176e760 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -17,15 +17,6 @@ BorderRenderObject::BorderRenderObject() {
 
 BorderRenderObject::~BorderRenderObject() {}
 
-void BorderRenderObject::SetBorderStyle(const BorderStyle& style) {
-  border_brush_ = style.border_brush;
-  border_thickness_ = style.border_thickness;
-  border_radius_ = style.border_radius;
-  foreground_brush_ = style.foreground_brush;
-  background_brush_ = style.background_brush;
-  InvalidateLayout();
-}
-
 void BorderRenderObject::ApplyBorderStyle(
     const style::ApplyBorderStyleInfo& style) {
   if (style.border_brush != nullptr) border_brush_ = style.border_brush;
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp
index 891eb062..f4866c04 100644
--- a/src/ui/style/Condition.cpp
+++ b/src/ui/style/Condition.cpp
@@ -51,6 +51,16 @@ bool FocusCondition::Judge(controls::Control* control) const {
   return control->HasFocus() == has_focus_;
 }
 
+std::vector<IBaseEvent*> HoverCondition::ChangeOn(
+    controls::Control* control) const {
+  return {control->MouseEnterEvent()->Direct(),
+          control->MouseLeaveEvent()->Direct()};
+}
+
+bool HoverCondition::Judge(controls::Control* control) const {
+  return control->IsMouseOver() == hover_;
+}
+
 ClickStateCondition::ClickStateCondition(helper::ClickState click_state)
     : click_state_(click_state) {}
 
diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp
index e69de29b..403fe114 100644
--- a/src/ui/style/StyleRuleSet.cpp
+++ b/src/ui/style/StyleRuleSet.cpp
@@ -0,0 +1,58 @@
+#include "cru/ui/style/StyleRuleSet.hpp"
+#include "cru/common/Event.hpp"
+#include "gsl/gsl_assert"
+
+#include <unordered_set>
+
+namespace cru::ui::style {
+void StyleRuleSet::AddStyleRule(StyleRule rule, gsl::index index) {
+  Expects(index >= 0 && index <= GetSize());
+
+  rules_.insert(rules_.cbegin() + index, std::move(rule));
+
+  UpdateChangeListener();
+  UpdateStyle();
+}
+
+void StyleRuleSet::RemoveStyleRule(gsl::index index, gsl::index count) {
+  Expects(index >= 0);
+  Expects(count >= 0 && index + count <= GetSize());
+
+  rules_.erase(rules_.cbegin() + index, rules_.cbegin() + index + count);
+
+  UpdateChangeListener();
+  UpdateStyle();
+}
+
+void StyleRuleSet::Set(const StyleRuleSet& other) {
+  rules_ = other.rules_;
+  UpdateChangeListener();
+  UpdateStyle();
+}
+
+void StyleRuleSet::UpdateChangeListener() {
+  if (control_ == nullptr) return;
+
+  guard_.Clear();
+
+  std::unordered_set<IBaseEvent*> events;
+  for (const auto& rule : rules_) {
+    auto e = rule.GetCondition()->ChangeOn(control_);
+    events.insert(e.cbegin(), e.cend());
+  }
+
+  for (auto e : events) {
+    guard_ += e->AddSpyOnlyHandler([this] { this->UpdateStyle(); });
+  }
+}
+
+void StyleRuleSet::UpdateStyle() {
+  if (control_ == nullptr) return;
+
+  for (const auto& rule : rules_) {
+    if (rule.GetCondition()->Judge(control_)) {
+      rule.GetStyler()->Apply(control_);
+    }
+  }
+}
+}  // namespace cru::ui::style
diff --git a/src/win/gui/Window.cpp b/src/win/gui/Window.cpp
index 174b8931..efd3bfcc 100644
--- a/src/win/gui/Window.cpp
+++ b/src/win/gui/Window.cpp
@@ -367,9 +367,9 @@ RECT WinNativeWindow::GetClientRectPixel() {
 }
 
 void WinNativeWindow::OnDestroyInternal() {
+  destroy_event_.Raise(nullptr);
   application_->GetWindowManager()->UnregisterWindow(hwnd_);
   hwnd_ = nullptr;
-  destroy_event_.Raise(nullptr);
   if (!sync_flag_) {
     sync_flag_ = true;
     delete this;
-- 
cgit v1.2.3