2 files changed, 69 insertions, 75 deletions
diff --git a/include/cru/ui/style/Condition.hpp b/include/cru/ui/style/Condition.hpp
new file mode 100644
index 00000000..b88a338f
--- /dev/null
+++ b/include/cru/ui/style/Condition.hpp
@@ -0,0 +1,69 @@
+#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 <type_traits>
+#include <utility>
+#include <vector>
+
+namespace cru::ui::style {
+class Condition {
+ public:
+  virtual ~Condition() = default;
+
+  virtual std::vector<IBaseEvent*> ChangeOn(
+      controls::Control* control) const = 0;
+  virtual bool Judge(controls::Control* control) const = 0;
+};
+
+class CompoundCondition : public Condition {
+ public:
+  explicit CompoundCondition(std::vector<Condition*> conditions);
+
+  const std::vector<Condition*>& GetConditions() const { return conditions_; }
+
+  std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
+
+ private:
+  std::vector<Condition*> conditions_;
+};
+
+class AndCondition : public CompoundCondition {
+ public:
+  using CompoundCondition::CompoundCondition;
+
+  bool Judge(controls::Control* control) const override;
+};
+
+class OrCondition : public CompoundCondition {
+ public:
+  using CompoundCondition::CompoundCondition;
+
+  bool Judge(controls::Control* control) const override;
+};
+
+class FocusCondition : public Condition {
+ public:
+  explicit FocusCondition(bool has_focus);
+
+  std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
+  bool Judge(controls::Control* control) const override;
+
+ private:
+  bool has_focus_;
+};
+
+class ClickStateCondition : public Condition {
+ public:
+  explicit ClickStateCondition(helper::ClickState click_state);
+
+  std::vector<IBaseEvent*> ChangeOn(controls::Control* control) const override;
+  bool Judge(controls::Control* control) const override;
+
+ private:
+  helper::ClickState click_state_;
+};
+}  // namespace cru::ui::style
diff --git a/include/cru/ui/style/Trigger.hpp b/include/cru/ui/style/Trigger.hpp
deleted file mode 100644
index ab012a3e..00000000
--- a/include/cru/ui/style/Trigger.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#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