...

5 files changed, 98 insertions, 48 deletions

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
--- /dev/null
+++ b/include/cru/ui/style/Styler.hpp
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