aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CruUI/ui/control.cpp9
-rw-r--r--CruUI/ui/control.h7
-rw-r--r--CruUI/ui/controls/text_block.cpp30
-rw-r--r--CruUI/ui/controls/text_block.h3
-rw-r--r--CruUI/ui/window.cpp11
5 files changed, 30 insertions, 30 deletions
diff --git a/CruUI/ui/control.cpp b/CruUI/ui/control.cpp
index 41693ed8..4d9f0593 100644
--- a/CruUI/ui/control.cpp
+++ b/CruUI/ui/control.cpp
@@ -28,6 +28,11 @@ namespace cru {
}
+ Control::Control(WindowConstructorTag, Window* window) : Control(true)
+ {
+ window_ = window;
+ }
+
Control::~Control()
{
ForeachChild([](auto control)
@@ -275,7 +280,7 @@ namespace cru {
void Control::OnAddChild(Control* child)
{
- if (auto window = dynamic_cast<Window*>(GetAncestor()))
+ if (auto window = GetWindow())
{
child->TraverseDescendants([window](Control* control) {
control->OnAttachToWindow(window);
@@ -287,7 +292,7 @@ namespace cru {
void Control::OnRemoveChild(Control* child)
{
- if (auto window = dynamic_cast<Window*>(GetAncestor()))
+ if (auto window = GetWindow())
{
child->TraverseDescendants([window](Control* control) {
control->OnDetachToWindow(window);
diff --git a/CruUI/ui/control.h b/CruUI/ui/control.h
index 41401008..0c19f305 100644
--- a/CruUI/ui/control.h
+++ b/CruUI/ui/control.h
@@ -29,7 +29,10 @@ namespace cru
friend class Window;
friend class WindowLayoutManager;
protected:
+ struct WindowConstructorTag {};
+
explicit Control(bool container = false);
+ Control(WindowConstructorTag, Window* window);
public:
Control(const Control& other) = delete;
@@ -251,8 +254,10 @@ namespace cru
private:
bool is_container_;
- Window * window_;
+ protected:
+ Window * window_; // protected for Window class to write it as itself in constructor.
+ private:
Control * parent_;
Vector<Control*> children_;
diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp
index 04166f32..00850b0b 100644
--- a/CruUI/ui/controls/text_block.cpp
+++ b/CruUI/ui/controls/text_block.cpp
@@ -26,12 +26,9 @@ namespace cru
TextBlock::TextBlock(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : Control(false),
- window_deactivated_handler_(new events::UiEvent::EventHandler([this](events::UiEvent::ArgsType& args)
+ window_deactivated_handler_(new events::UiEvent::EventHandler([this](events::UiEvent::ArgsType& args)
{
- if (is_selecting_)
- {
- is_selecting_ = false;
- }
+ is_selecting_ = false;
}))
{
text_format_ = init_text_format;
@@ -68,15 +65,14 @@ namespace cru
void TextBlock::OnAttachToWindow(Window* window)
{
- window->deactivated_event.AddHandler([](auto args)
- {
-
- });
+ Control::OnAttachToWindow(window);
+ window->deactivated_event.AddHandler(window_deactivated_handler_);
}
void TextBlock::OnDetachToWindow(Window* window)
{
-
+ Control::OnDetachToWindow(window);
+ window->deactivated_event.RemoveHandler(window_deactivated_handler_);
}
void TextBlock::OnSizeChangedCore(events::SizeChangedEventArgs& args)
@@ -132,6 +128,7 @@ namespace cru
if (args.GetMouseButton() == MouseButton::Left)
{
RequestFocus();
+ selected_range_ = std::nullopt;
const auto hit_test_result = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), true);
if (hit_test_result.has_value())
{
@@ -139,19 +136,16 @@ namespace cru
is_selecting_ = true;
GetWindow()->CaptureMouseFor(this);
}
- else
- {
- selected_range_ = std::nullopt;
- }
+ Repaint();
}
Control::OnMouseDownCore(args);
}
void TextBlock::OnMouseMoveCore(events::MouseEventArgs& args)
{
+ OutputDebugStringW(L"Mouse move!");
if (is_selecting_)
{
- is_mouse_moved_ = true;
const auto hit_test_result = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), false).value();
if (hit_test_result > mouse_down_position_)
selected_range_ = TextRange(mouse_down_position_, hit_test_result - mouse_down_position_);
@@ -170,12 +164,6 @@ namespace cru
{
if (is_selecting_)
{
- if (!is_mouse_moved_)
- {
- selected_range_ = std::nullopt;
- Repaint();
- }
- is_mouse_moved_ = false;
is_selecting_ = false;
GetWindow()->ReleaseCurrentMouseCapture();
}
diff --git a/CruUI/ui/controls/text_block.h b/CruUI/ui/controls/text_block.h
index 4c1f1fb1..689607ac 100644
--- a/CruUI/ui/controls/text_block.h
+++ b/CruUI/ui/controls/text_block.h
@@ -128,11 +128,10 @@ namespace cru
Vector<std::shared_ptr<TextLayoutHandler>> text_layout_handlers_;
+ bool is_selecting_ = false;
unsigned mouse_down_position_ = 0;
- bool is_mouse_moved_ = false;
std::optional<TextRange> selected_range_ = std::nullopt;
- bool is_selecting_ = false;
events::UiEvent::EventHandlerPtr window_deactivated_handler_;
};
diff --git a/CruUI/ui/window.cpp b/CruUI/ui/window.cpp
index fe37fc46..d43f2e77 100644
--- a/CruUI/ui/window.cpp
+++ b/CruUI/ui/window.cpp
@@ -91,7 +91,7 @@ namespace cru
else if (result != nullptr)
return; // find a ancestor of "control", just return
}
-
+
cache_invalid_controls_.insert(control);
if (cache_invalid_controls_.size() == 1) // when insert just now and not repeat to "InvokeLater".
@@ -105,7 +105,7 @@ namespace cru
control->CheckAndNotifyPositionChanged();
});
cache_invalid_controls_.clear(); // after update and notify, clear the set.
-
+
});
}
}
@@ -149,8 +149,8 @@ namespace cru
);
}
- Window::Window() : Control(true), layout_manager_(new WindowLayoutManager()), control_list_({ this }) {
- auto app = Application::GetInstance();
+ Window::Window() : Control(WindowConstructorTag{}, this), layout_manager_(new WindowLayoutManager()), control_list_({ this }) {
+ const auto app = Application::GetInstance();
hwnd_ = CreateWindowEx(0,
app->GetWindowManager()->GetGeneralWindowClass()->GetName(),
L"", WS_OVERLAPPEDWINDOW,
@@ -168,6 +168,9 @@ namespace cru
Window::~Window() {
Close();
+ TraverseDescendants([this](Control* control) {
+ control->OnDetachToWindow(this);
+ });
}
void Window::Close() {
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-29 03:46:40 +0000