From 99a322a6badf5b6d95be4944e80d92fc1cb2589e Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Sun, 11 Aug 2019 22:08:49 +0800 Subject: ... --- include/cru/common/base.hpp | 16 +++++ include/cru/ui/click_detector.hpp | 87 ++++++++++++++++++++++++++++ include/cru/ui/control.hpp | 14 ++--- include/cru/win/graph/direct/text_layout.hpp | 4 +- 4 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 include/cru/ui/click_detector.hpp (limited to 'include') diff --git a/include/cru/common/base.hpp b/include/cru/common/base.hpp index d72b97f2..920fe569 100644 --- a/include/cru/common/base.hpp +++ b/include/cru/common/base.hpp @@ -1,6 +1,22 @@ #pragma once #include "pre_config.hpp" +#define CRU_DEFAULT_COPY(classname) \ + classname(const classname&) = default; \ + classname& operator=(const classname&) = default; + +#define CRU_DEFAULT_MOVE(classname) \ + classname(classname&&) = default; \ + classname& operator=(classname&&) = default; + +#define CRU_DELETE_COPY(classname) \ + classname(const classname&) = delete; \ + classname& operator=(const classname&) = delete; + +#define CRU_DELETE_MOVE(classname) \ + classname(classname&&) = delete; \ + classname& operator=(classname&&) = delete; + namespace cru { class Object { public: diff --git a/include/cru/ui/click_detector.hpp b/include/cru/ui/click_detector.hpp new file mode 100644 index 00000000..e7d5e417 --- /dev/null +++ b/include/cru/ui/click_detector.hpp @@ -0,0 +1,87 @@ +#pragma once +#include "control.hpp" + +#include +#include +#include + +namespace cru::ui { +class ClickEventArgs : Object { + public: + ClickEventArgs(Control* sender, const Point& down_point, + const Point& up_point, MouseButton button) + : sender_(sender), + down_point_(down_point), + up_point_(up_point), + button_(button) {} + + CRU_DEFAULT_COPY(ClickEventArgs) + CRU_DEFAULT_MOVE(ClickEventArgs) + + ~ClickEventArgs() override = default; + + Control* GetSender() const { return sender_; } + Point GetDownPoint() const { return down_point_; } + Point GetUpPoint() const { return up_point_; } + MouseButton GetButton() const { return button_; } + + private: + Control* sender_; + Point down_point_; + Point up_point_; + MouseButton button_; +}; + +class ClickDetector : public Object { + public: + explicit ClickDetector(Control* control); + + ClickDetector(const ClickDetector& other) = delete; + ClickDetector& operator=(const ClickDetector& other) = delete; + ClickDetector(ClickDetector&& other) = delete; + ClickDetector& operator=(ClickDetector&& other) = delete; + + ~ClickDetector() override = default; + + Control* GetControl() const { return control_; } + + // Return a union of buttons being pressed. Return 0 if no button is being + // pressed. + MouseButton IsPressing() const { + unsigned result = 0; + if (click_map_.left.has_value()) result |= MouseButton::Left; + if (click_map_.middle.has_value()) result |= MouseButton::Middle; + if (click_map_.right.has_value()) result |= MouseButton::Right; + return static_cast(result); + } + + IEvent* ClickEvent() { return &event_; } + + private: + std::optional& FromButton(MouseButton button) { + switch (button) { + case MouseButton::Left: + return click_map_.left; + case MouseButton::Middle: + return click_map_.middle; + case MouseButton::Right: + return click_map_.right; + default: + std::abort(); + } + } + + private: + Control* control_; + + Event event_; + + std::forward_list event_rovoker_guards_; + + struct { + std::optional left = std::nullopt; + std::optional middle = std::nullopt; + std::optional right = std::nullopt; + } click_map_; +}; +} // namespace cru::ui diff --git a/include/cru/ui/control.hpp b/include/cru/ui/control.hpp index f78557a3..b39b59a0 100644 --- a/include/cru/ui/control.hpp +++ b/include/cru/ui/control.hpp @@ -18,7 +18,7 @@ class Control : public Object { friend class Window; protected: - Control() = default; + Control(); public: Control(const Control& other) = delete; @@ -58,10 +58,14 @@ class Control : public Object { bool HasFocus(); - //*************** region: focus *************** + //*************** region: mouse *************** public: bool IsMouseOver() const { return is_mouse_over_; } + bool CaptureMouse(); // TODO + + bool IsMouseCaptured(); // TODO + //*************** region: events *************** public: // Raised when mouse enter the control. @@ -84,11 +88,6 @@ class Control : public Object { event::RoutedEvent* MouseUpEvent() { return &mouse_up_event_; } - // Raised when a mouse button is pressed in the control and released in the - // control with mouse not leaving it between two operations. - event::RoutedEvent* MouseClickEvent() { - return &mouse_click_event_; - } event::RoutedEvent* MouseWheelEvent() { return &mouse_wheel_event_; } @@ -114,7 +113,6 @@ class Control : public Object { event::RoutedEvent mouse_move_event_; event::RoutedEvent mouse_down_event_; event::RoutedEvent mouse_up_event_; - event::RoutedEvent mouse_click_event_; event::RoutedEvent mouse_wheel_event_; event::RoutedEvent key_down_event_; diff --git a/include/cru/win/graph/direct/text_layout.hpp b/include/cru/win/graph/direct/text_layout.hpp index c7657762..a20591c2 100644 --- a/include/cru/win/graph/direct/text_layout.hpp +++ b/include/cru/win/graph/direct/text_layout.hpp @@ -35,8 +35,8 @@ class DWriteTextLayout : public TextLayout, std::wstring GetText() override; void SetText(std::wstring new_text) override; - std::shared_ptr GetFont(); - void SetFont(std::shared_ptr font); + std::shared_ptr GetFont() override; + void SetFont(std::shared_ptr font) override; void SetMaxWidth(float max_width) override; void SetMaxHeight(float max_height) override; -- cgit v1.2.3