diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/ui/DeleteLater.cpp | 2 | ||||
| -rw-r--r-- | src/ui/components/Component.cpp | 4 | ||||
| -rw-r--r-- | src/ui/components/Menu.cpp | 27 | ||||
| -rw-r--r-- | src/ui/components/PopupButton.cpp | 1 | ||||
| -rw-r--r-- | src/ui/controls/Control.cpp | 120 | ||||
| -rw-r--r-- | src/ui/controls/Popup.cpp | 18 | ||||
| -rw-r--r-- | src/ui/controls/RootControl.cpp | 49 | ||||
| -rw-r--r-- | src/ui/controls/TextHostControlService.cpp | 31 | ||||
| -rw-r--r-- | src/ui/controls/Window.cpp | 426 | ||||
| -rw-r--r-- | src/ui/events/MouseEventArgs.cpp | 10 | ||||
| -rw-r--r-- | src/ui/helper/ClickDetector.cpp | 12 | ||||
| -rw-r--r-- | src/ui/host/LayoutPaintCycler.cpp | 35 | ||||
| -rw-r--r-- | src/ui/host/RoutedEventDispatch.h | 122 | ||||
| -rw-r--r-- | src/ui/host/WindowHost.cpp | 457 | ||||
| -rw-r--r-- | src/ui/render/RenderObject.cpp | 14 | ||||
| -rw-r--r-- | src/ui/render/ScrollBar.cpp | 16 |
17 files changed, 537 insertions, 811 deletions
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 4dfee0cb..84849d44 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -15,8 +15,6 @@ add_library(CruUi controls/FlexLayout.cpp controls/IconButton.cpp controls/NoChildControl.cpp - controls/Popup.cpp - controls/RootControl.cpp controls/ScrollView.cpp controls/StackLayout.cpp controls/TextBlock.cpp @@ -30,8 +28,6 @@ add_library(CruUi events/MouseEventArgs.cpp helper/ClickDetector.cpp helper/ShortcutHub.cpp - host/LayoutPaintCycler.cpp - host/WindowHost.cpp mapper/BorderStyleMapper.cpp mapper/BrushMapper.cpp mapper/ColorMapper.cpp diff --git a/src/ui/DeleteLater.cpp b/src/ui/DeleteLater.cpp index 27ec2155..90b07b71 100644 --- a/src/ui/DeleteLater.cpp +++ b/src/ui/DeleteLater.cpp @@ -20,6 +20,4 @@ void DeleteLaterImpl::DeleteLater() { delete_later_scheduled_ = true; } } - -void DeleteLaterImpl::OnPrepareDelete() {} } // namespace cru::ui diff --git a/src/ui/components/Component.cpp b/src/ui/components/Component.cpp index d0525a1c..77a659dc 100644 --- a/src/ui/components/Component.cpp +++ b/src/ui/components/Component.cpp @@ -1,10 +1,6 @@ #include "cru/ui/components/Component.h" -#include "cru/ui/controls/Control.h" - namespace cru::ui::components { -void Component::OnPrepareDelete() { GetRootControl()->RemoveFromParent(); } - void Component::DeleteIfDeleteByParent(bool delete_later) { if (delete_by_parent_) { if (delete_later) { diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp index 04227d66..c89c7fc9 100644 --- a/src/ui/components/Menu.cpp +++ b/src/ui/components/Menu.cpp @@ -4,10 +4,9 @@ #include "cru/ui/controls/Button.h" #include "cru/ui/controls/Control.h" #include "cru/ui/controls/FlexLayout.h" -#include "cru/ui/controls/Popup.h" #include "cru/ui/controls/TextBlock.h" +#include "cru/ui/controls/Window.h" #include "cru/ui/helper/ClickDetector.h" -#include "cru/ui/host/WindowHost.h" #include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::components { @@ -22,8 +21,6 @@ MenuItem::MenuItem() { MenuItem::MenuItem(std::string text) : MenuItem() { SetText(std::move(text)); } -MenuItem::~MenuItem() {} - void MenuItem::SetText(std::string text) { text_.SetText(std::move(text)); } Menu::Menu() { @@ -33,7 +30,7 @@ Menu::Menu() { Menu::~Menu() { for (auto item : items_) { - item->DeleteIfDeleteByParent(false); + item->DeleteIfDeleteByParent(); } } @@ -78,27 +75,29 @@ void Menu::AddTextItemAt(std::string text, Index index, } PopupMenu::PopupMenu(controls::Control* attached_control) - : attached_control_(attached_control), popup_(attached_control) { - menu_.SetOnItemClick([this](Index) { popup_.GetNativeWindow()->Close(); }); - popup_.AddChildAt(menu_.GetRootControl(), 0); + : attached_control_(attached_control) { + menu_.SetOnItemClick([this](Index) { popup_->GetNativeWindow()->Close(); }); + popup_ = controls::Window::CreatePopup(); + popup_->SetAttachedControl(attached_control); + popup_->AddChildAt(menu_.GetRootControl(), 0); } -PopupMenu::~PopupMenu() {} +PopupMenu::~PopupMenu() { delete popup_; } -controls::Control* PopupMenu::GetRootControl() { return &popup_; } +controls::Control* PopupMenu::GetRootControl() { return popup_; } void PopupMenu::SetPosition(const Point& position) { - auto window = popup_.GetWindowHost()->GetNativeWindow(); + auto window = popup_->GetNativeWindow(); window->SetClientRect(Rect{position, window->GetClientSize()}); } void PopupMenu::Show() { - auto native_window = popup_.GetWindowHost()->GetNativeWindow(); + auto native_window = popup_->GetNativeWindow(); native_window->SetVisibility(platform::gui::WindowVisibilityType::Show); - popup_.GetWindowHost()->RelayoutWithSize(Size::Infinite(), true); + popup_->RelayoutWithSize(Size::Infinite(), true); native_window->RequestFocus(); native_window->SetToForeground(); } -void PopupMenu::Close() { popup_.GetWindowHost()->GetNativeWindow()->Close(); } +void PopupMenu::Close() { popup_->GetNativeWindow()->Close(); } } // namespace cru::ui::components diff --git a/src/ui/components/PopupButton.cpp b/src/ui/components/PopupButton.cpp index 5ea41d78..1869ba31 100644 --- a/src/ui/components/PopupButton.cpp +++ b/src/ui/components/PopupButton.cpp @@ -1,6 +1,5 @@ #include "cru/ui/components/PopupButton.h" #include "cru/ui/components/Menu.h" -#include "cru/ui/controls/Popup.h" #include "cru/ui/helper/ClickDetector.h" namespace cru::ui::components { diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp index 93213ecf..e903b5b3 100644 --- a/src/ui/controls/Control.cpp +++ b/src/ui/controls/Control.cpp @@ -1,10 +1,12 @@ #include "cru/ui/controls/Control.h" +#include "cru/ui/controls/Window.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" -#include "cru/ui/host/WindowHost.h" #include "cru/ui/style/StyleRuleSet.h" +#include <format> + namespace cru::ui::controls { using platform::gui::ICursor; using platform::gui::IUiApplication; @@ -15,32 +17,45 @@ Control::Control() { style_rule_set_bind_ = std::make_unique<style::StyleRuleSetBind>(this, style_rule_set_); - MouseEnterEvent()->Direct()->AddHandler([this](events::MouseEventArgs&) { - this->is_mouse_over_ = true; - this->OnMouseHoverChange(true); - }); + MouseEnterEvent()->Direct()->AddHandler( + [this](events::MouseEventArgs&) { this->is_mouse_over_ = true; }); - MouseLeaveEvent()->Direct()->AddHandler([this](events::MouseEventArgs&) { - this->is_mouse_over_ = false; - this->OnMouseHoverChange(true); - }); + MouseLeaveEvent()->Direct()->AddHandler( + [this](events::MouseEventArgs&) { this->is_mouse_over_ = false; }); } Control::~Control() { - if (host::WindowHost::IsInEventHandling()) { - // Don't delete control during event handling. Use DeleteLater. - std::terminate(); + if (auto window = GetWindow()) { + if (window->IsInEventHandling()) { + // Don't delete control during event handling. Use DeleteLater. + std::terminate(); + } } - in_destruction_ = true; RemoveFromParent(); } +std::string Control::GetDebugId() const { + return std::format("{}({})", GetControlType(), + static_cast<const void*>(this)); +} + +Window* Control::GetWindow() { + auto parent = this; + while (parent) { + if (auto window = dynamic_cast<Window*>(parent)) { + return window; + } + parent = parent->GetParent(); + } + return nullptr; +} + void Control::SetParent(Control* parent) { if (parent_ == parent) return; auto old_parent = parent_; parent_ = parent; - OnParentChangedCore(old_parent, parent); + OnParentChanged(old_parent, parent); } void Control::RemoveFromParent() { @@ -49,39 +64,49 @@ void Control::RemoveFromParent() { } } +controls::Control* Control::HitTest(const Point& point) { + const auto render_object = GetRenderObject()->HitTest(point); + if (render_object) { + const auto control = render_object->GetAttachedControl(); + assert(control); + return control; + } + return nullptr; +} + bool Control::HasFocus() { - auto host = GetWindowHost(); - if (host == nullptr) return false; + auto window = GetWindow(); + if (window == nullptr) return false; - return host->GetFocusControl() == this; + return window->GetFocusControl() == this; } bool Control::CaptureMouse() { - auto host = GetWindowHost(); - if (host == nullptr) return false; + auto window = GetWindow(); + if (window == nullptr) return false; - return host->CaptureMouseFor(this); + return window->SetMouseCaptureControl(this); } void Control::SetFocus() { - auto host = GetWindowHost(); - if (host == nullptr) return; + auto window = GetWindow(); + if (window == nullptr) return; - host->SetFocusControl(this); + window->SetFocusControl(this); } bool Control::ReleaseMouse() { - auto host = GetWindowHost(); - if (host == nullptr) return false; - - return host->CaptureMouseFor(nullptr); + auto window = GetWindow(); + if (window == nullptr) return false; + if (window->GetMouseCaptureControl() != this) return false; + return window->SetMouseCaptureControl(nullptr); } bool Control::IsMouseCaptured() { - auto host = GetWindowHost(); - if (host == nullptr) return false; + auto window = GetWindow(); + if (window == nullptr) return false; - return host->GetMouseCaptureControl() == this; + return window->GetMouseCaptureControl() == this; } std::shared_ptr<ICursor> Control::GetCursor() { return cursor_; } @@ -99,42 +124,13 @@ std::shared_ptr<ICursor> Control::GetInheritedCursor() { void Control::SetCursor(std::shared_ptr<ICursor> cursor) { cursor_ = std::move(cursor); - const auto host = GetWindowHost(); - if (host != nullptr) { - host->UpdateCursor(); + const auto window = GetWindow(); + if (window != nullptr) { + window->UpdateCursor(); } } std::shared_ptr<style::StyleRuleSet> Control::GetStyleRuleSet() { return style_rule_set_; } - -void Control::OnParentChangedCore(Control* old_parent, Control* new_parent) { - auto new_window_host = - new_parent == nullptr ? nullptr : new_parent->GetWindowHost(); - if (window_host_ != new_window_host) { - auto old_host = window_host_; - window_host_ = new_window_host; - OnWindowHostChangedCore(old_host, new_window_host); - } - - if (!in_destruction_) OnParentChanged(old_parent, new_parent); -} - -void Control::OnWindowHostChangedCore(host::WindowHost* old_host, - host::WindowHost* new_host) { - if (old_host != nullptr) { - old_host->OnControlDetach(this); - } - - if (!in_destruction_) { - ForEachChild([old_host, new_host](Control* child) { - child->window_host_ = new_host; - child->OnWindowHostChangedCore(old_host, new_host); - }); - OnWindowHostChanged(old_host, new_host); - } -} - -void Control::OnPrepareDelete() { RemoveFromParent(); } } // namespace cru::ui::controls diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp deleted file mode 100644 index 238ddbd4..00000000 --- a/src/ui/controls/Popup.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "cru/ui/controls/Popup.h" - -#include "cru/platform/gui/UiApplication.h" -#include "cru/ui/controls/RootControl.h" -#include "cru/ui/host/WindowHost.h" -#include "cru/ui/render/StackLayoutRenderObject.h" - -#include <memory> - -namespace cru::ui::controls { -Popup::Popup(Control* attached_control) : RootControl(attached_control) { - GetWindowHost()->GetNativeWindow()->SetStyleFlag( - cru::platform::gui::WindowStyleFlags::NoCaptionAndBorder); - SetGainFocusOnCreateAndDestroyWhenLoseFocus(true); -} - -Popup::~Popup() = default; -} // namespace cru::ui::controls diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp deleted file mode 100644 index 7be1c630..00000000 --- a/src/ui/controls/RootControl.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "cru/ui/controls/RootControl.h" - -#include "cru/platform/gui/Window.h" -#include "cru/ui/Base.h" -#include "cru/ui/host/WindowHost.h" - -#include <memory> - -namespace cru::ui::controls { -RootControl::RootControl(Control* attached_control) - : attached_control_(attached_control) { - GetContainerRenderObject()->SetDefaultHorizontalAlignment(Alignment::Stretch); - GetContainerRenderObject()->SetDefaultVertialAlignment(Alignment::Stretch); - window_host_ = std::make_unique<host::WindowHost>(this); - - Control::window_host_ = this->window_host_.get(); - - window_host_->SetLayoutPreferToFillWindow(true); -} - -RootControl::~RootControl() {} - -platform::gui::INativeWindow* RootControl::GetNativeWindow() { - return window_host_->GetNativeWindow(); -} - -void RootControl::SetGainFocusOnCreateAndDestroyWhenLoseFocus(bool value) { - gain_focus_on_create_and_destroy_when_lose_focus_event_guard_.Clear(); - if (value) { - auto native_window = window_host_->GetNativeWindow(); - - gain_focus_on_create_and_destroy_when_lose_focus_event_guard_ += - native_window->VisibilityChangeEvent()->AddHandler( - [native_window](platform::gui::WindowVisibilityType type) { - if (type == platform::gui::WindowVisibilityType::Show) { - native_window->RequestFocus(); - } - }); - - gain_focus_on_create_and_destroy_when_lose_focus_event_guard_ += - native_window->FocusEvent()->AddHandler( - [native_window](platform::gui::FocusChangeType type) { - if (type == platform::gui::FocusChangeType::Lose) { - native_window->Close(); - } - }); - } -} -} // namespace cru::ui::controls diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp index 99090951..f51199c9 100644 --- a/src/ui/controls/TextHostControlService.cpp +++ b/src/ui/controls/TextHostControlService.cpp @@ -13,8 +13,8 @@ #include "cru/ui/Base.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/components/Menu.h" +#include "cru/ui/controls/Window.h" #include "cru/ui/helper/ShortcutHub.h" -#include "cru/ui/host/WindowHost.h" #include "cru/ui/render/ScrollRenderObject.h" #include "cru/ui/render/TextRenderObject.h" @@ -293,9 +293,9 @@ void TextHostControlService::DeleteText(TextRange range, platform::gui::IInputMethodContext* TextHostControlService ::GetInputMethodContext() { - host::WindowHost* host = this->control_->GetWindowHost(); - if (!host) return nullptr; - platform::gui::INativeWindow* native_window = host->GetNativeWindow(); + Window* window = this->control_->GetWindow(); + if (!window) return nullptr; + platform::gui::INativeWindow* native_window = window->GetNativeWindow(); if (!native_window) return nullptr; return native_window->GetInputMethodContext(); } @@ -340,12 +340,13 @@ void TextHostControlService::SetCaretBlinkDuration(int milliseconds) { void TextHostControlService::ScrollToCaret() { if (const auto scroll_render_object = this->GetScrollRenderObject()) { - auto window_host = this->control_->GetWindowHost(); - if (window_host) - window_host->RunAfterLayoutStable([this, scroll_render_object]() { - const auto caret_rect = this->GetTextRenderObject()->GetCaretRect(); - scroll_render_object->ScrollToContain(caret_rect, Thickness{5.f}); - }); + scroll_to_caret_timer_canceler_.Reset( + platform::gui::IUiApplication::GetInstance()->SetImmediate( + [this, scroll_render_object] { + const auto caret_rect = + this->GetTextRenderObject()->GetCaretRect(); + scroll_render_object->ScrollToContain(caret_rect, Thickness{5.f}); + })); } } @@ -587,10 +588,10 @@ void TextHostControlService::GainFocusHandler( this->ReplaceSelectedText(text); }); - host::WindowHost* window_host = control_->GetWindowHost(); - if (window_host) + auto window = control_->GetWindow(); + if (window) input_method_context_event_guard_ += - window_host->AfterLayoutEvent()->AddHandler( + window->AfterLayoutEvent()->AddHandler( [this](auto) { this->UpdateInputMethodPosition(); }); SetCaretVisible(true); } @@ -700,7 +701,9 @@ void TextHostControlService::SetUpShortcuts() { void TextHostControlService::OpenContextMenu(const Point& position, ContextMenuItem items) { CRU_LOG_TAG_DEBUG("Open context menu."); - context_menu_.reset(new components::PopupMenu()); + if (!context_menu_) { + context_menu_.reset(new components::PopupMenu()); + } auto menu = context_menu_->GetMenu(); menu->ClearItems(); if (items & ContextMenuItem::kSelectAll) { diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp index b1881136..e6abc48d 100644 --- a/src/ui/controls/Window.cpp +++ b/src/ui/controls/Window.cpp @@ -1,7 +1,431 @@ #include "cru/ui/controls/Window.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/Base.h" + +#include <cassert> + namespace cru::ui::controls { -Window::Window(Control* attached_control) : RootControl(attached_control) {} +Window::Window() + : event_handling_count_(0), + native_window_(CreateNativeWindow()), + focus_control_(this), + mouse_hover_control_(nullptr), + mouse_captured_control_(nullptr), + layout_prefer_to_fill_window_(true), + attached_control_(nullptr) { + GetContainerRenderObject()->SetDefaultHorizontalAlignment(Alignment::Stretch); + GetContainerRenderObject()->SetDefaultVertialAlignment(Alignment::Stretch); +} Window::~Window() {} + +Window* Window::CreatePopup() { + auto window = new Window(); + window->GetNativeWindow()->SetStyleFlag( + platform::gui::WindowStyleFlags::NoCaptionAndBorder); + window->SetGainFocusOnCreateAndDestroyWhenLoseFocus(true); + return window; +} + +std::string Window::GetControlType() const { return std::string(kControlType); } + +void Window::SetAttachedControl(Control* control) { + attached_control_ = control; +} + +platform::gui::INativeWindow* Window::GetNativeWindow() { + return native_window_.get(); +} + +void Window::SetGainFocusOnCreateAndDestroyWhenLoseFocus(bool value) { + gain_focus_on_create_and_destroy_when_lose_focus_event_guard_.Clear(); + if (value) { + gain_focus_on_create_and_destroy_when_lose_focus_event_guard_ += + native_window_->VisibilityChangeEvent()->AddHandler( + [this](platform::gui::WindowVisibilityType type) { + if (type == platform::gui::WindowVisibilityType::Show) { + native_window_->RequestFocus(); + } + }); + + gain_focus_on_create_and_destroy_when_lose_focus_event_guard_ += + native_window_->FocusEvent()->AddHandler( + [this](platform::gui::FocusChangeType type) { + if (type == platform::gui::FocusChangeType::Lose) { + native_window_->Close(); + } + }); + } +} + +namespace { +template <typename T> +inline void BindNativeEvent( + Window* window, platform::gui::INativeWindow* native_window, + IEvent<T>* event, + void (Window::*handler)(platform::gui::INativeWindow*, + typename IEvent<T>::Args)) { + event->AddHandler( + std::bind(handler, window, native_window, std::placeholders::_1)); +} +} // namespace + +namespace { +bool IsAncestor(Control* control, Control* ancestor) { + while (control != nullptr) { + if (control == ancestor) return true; + control = control->GetParent(); + } + return false; +} + +// Ancestor at last. +std::vector<Control*> GetAncestorList(Control* control) { + if (control == nullptr) return {}; + + std::vector<Control*> l; + while (control != nullptr) { + l.push_back(control); + control = control->GetParent(); + } + return l; +} + +Control* FindLowestCommonAncestor(Control* left, Control* right) { + if (left == nullptr || right == nullptr) return nullptr; + + auto&& left_list = GetAncestorList(left); + auto&& right_list = GetAncestorList(right); + + // the root is different + if (left_list.back() != right_list.back()) return nullptr; + + // find the last same control or the last control (one is ancestor of the + // other) + auto left_iter = left_list.crbegin(); + auto right_iter = right_list.crbegin(); + + while (true) { + if (left_iter == left_list.crend()) { + return left_list.front(); + } + if (right_iter == right_list.crend()) { + return right_list.front(); + } + if (*left_iter != *right_iter) { + return *(--left_iter); + } + ++left_iter; + ++right_iter; + } +} +} // namespace + +std::unique_ptr<platform::gui::INativeWindow> Window::CreateNativeWindow() { + const auto ui_application = platform::gui::IUiApplication::GetInstance(); + + auto native_window = ui_application->CreateWindow(); + assert(native_window); + + BindNativeEvent(this, native_window, native_window->DestroyEvent(), + &Window::OnNativeDestroy); + BindNativeEvent(this, native_window, native_window->PaintEvent(), + &Window::OnNativePaint); + BindNativeEvent(this, native_window, native_window->ResizeEvent(), + &Window::OnNativeResize); + BindNativeEvent(this, native_window, native_window->FocusEvent(), + &Window::OnNativeFocus); + BindNativeEvent(this, native_window, native_window->MouseEnterLeaveEvent(), + &Window::OnNativeMouseEnterLeave); + BindNativeEvent(this, native_window, native_window->MouseMoveEvent(), + &Window::OnNativeMouseMove); + BindNativeEvent(this, native_window, native_window->MouseDownEvent(), + &Window::OnNativeMouseDown); + BindNativeEvent(this, native_window, native_window->MouseUpEvent(), + &Window::OnNativeMouseUp); + BindNativeEvent(this, native_window, native_window->MouseWheelEvent(), + &Window::OnNativeMouseWheel); + BindNativeEvent(this, native_window, native_window->KeyDownEvent(), + &Window::OnNativeKeyDown); + BindNativeEvent(this, native_window, native_window->KeyUpEvent(), + &Window::OnNativeKeyUp); + + return std::unique_ptr<platform::gui::INativeWindow>(native_window); +} + +void Window::InvalidatePaint() { + repaint_schedule_canceler_.Reset( + platform::gui::IUiApplication::GetInstance()->SetImmediate( + [this] { Repaint(); })); +} + +void Window::InvalidateLayout() { + relayout_schedule_canceler_.Reset( + platform::gui::IUiApplication::GetInstance()->SetImmediate( + [this] { Relayout(); })); +} + +bool Window::IsLayoutPreferToFillWindow() const { + return layout_prefer_to_fill_window_; +} + +void Window::SetLayoutPreferToFillWindow(bool value) { + if (value == layout_prefer_to_fill_window_) return; + layout_prefer_to_fill_window_ = value; + InvalidateLayout(); +} + +void Window::Repaint() { + auto painter = native_window_->BeginPaint(); + painter->Clear(colors::white); + GetRenderObject()->Draw(painter.get()); + painter->EndDraw(); +} + +void Window::Relayout() { RelayoutWithSize(native_window_->GetClientSize()); } + +void Window::RelayoutWithSize(const Size& available_size, + bool set_window_size_to_fit_content) { + auto render_object = GetRenderObject(); + render_object->Measure( + render::MeasureRequirement{ + available_size, + !set_window_size_to_fit_content && IsLayoutPreferToFillWindow() + ? render::MeasureSize(available_size) + : render::MeasureSize::NotSpecified()}, + render::MeasureSize::NotSpecified()); + + if (set_window_size_to_fit_content) { + native_window_->SetClientSize(render_object->GetDesiredSize()); + } + + render_object->Layout(Point{}); + CRU_LOG_TAG_DEBUG("A relayout is finished."); + + AfterLayoutEvent_.Raise(nullptr); + + InvalidatePaint(); +} + +Control* Window::GetFocusControl() { return focus_control_; } + +void Window::SetFocusControl(Control* control) { + if (control == nullptr) control = this; + if (focus_control_ == control) return; + + const auto old_focus_control = focus_control_; + + focus_control_ = control; + + DispatchFocusControlChangeEvent(old_focus_control, focus_control_, false); +} + +Control* Window::GetMouseCaptureControl() { return mouse_captured_control_; } + +bool Window::SetMouseCaptureControl(Control* control) { + if (!native_window_->CaptureMouse()) return false; + + if (control == mouse_captured_control_) return true; + + if (control == nullptr) { + native_window_->ReleaseMouse(); + const auto old_capture_control = mouse_captured_control_; + mouse_captured_control_ = + nullptr; // update this in case this is used in event handlers + if (old_capture_control != mouse_hover_control_) { + DispatchMouseHoverControlChangeEvent( + old_capture_control, mouse_hover_control_, + native_window_->GetMousePosition(), true, false); + } + UpdateCursor(); + return true; + } + + if (mouse_captured_control_) return false; + + mouse_captured_control_ = control; + DispatchMouseHoverControlChangeEvent( + mouse_hover_control_, mouse_captured_control_, + native_window_->GetMousePosition(), false, true); + UpdateCursor(); + return true; +} + +std::shared_ptr<platform::gui::ICursor> Window::GetOverrideCursor() { + return override_cursor_; +} + +void Window::SetOverrideCursor(std::shared_ptr<platform::gui::ICursor> cursor) { + if (cursor == override_cursor_) return; + override_cursor_ = cursor; + UpdateCursor(); +} + +bool Window::IsInEventHandling() { return event_handling_count_; } + +void Window::UpdateCursor() { + if (override_cursor_) { + native_window_->SetCursor(override_cursor_); + } else { + const auto capture = GetMouseCaptureControl(); + native_window_->SetCursor( + (capture ? capture : GetMouseHoverControl())->GetInheritedCursor()); + } +} + +void Window::OnNativeDestroy(platform::gui::INativeWindow* window, + std::nullptr_t) { + CRU_UNUSED(window) +} + +void Window::OnNativePaint(platform::gui::INativeWindow* window, + std::nullptr_t) { + CRU_UNUSED(window) + InvalidatePaint(); +} + +void Window::OnNativeResize(platform::gui::INativeWindow* window, + const Size& size) { + CRU_UNUSED(window) + CRU_UNUSED(size) + + InvalidateLayout(); +} + +void Window::OnNativeFocus(platform::gui::INativeWindow* window, + platform::gui::FocusChangeType focus) { + CRU_UNUSED(window) + + focus == platform::gui::FocusChangeType::Gain + ? DispatchEvent(focus_control_, &Control::GainFocusEvent, nullptr, true) + : DispatchEvent(focus_control_, &Control::LoseFocusEvent, nullptr, true); +} + +void Window::OnNativeMouseEnterLeave(platform::gui::INativeWindow* window, + platform::gui::MouseEnterLeaveType type) { + CRU_UNUSED(window) + + if (type == platform::gui::MouseEnterLeaveType::Leave) { + DispatchEvent(mouse_hover_control_, &Control::MouseLeaveEvent, nullptr); + mouse_hover_control_ = nullptr; + } +} + +void Window::OnNativeMouseMove(platform::gui::INativeWindow* window, + const Point& point) { + CRU_UNUSED(window) + + // Find the first control that hit test succeed. + const auto new_mouse_hover_control = HitTest(point); + const auto old_mouse_hover_control = mouse_hover_control_; + mouse_hover_control_ = new_mouse_hover_control; + + if (mouse_captured_control_) { + const auto n = FindLowestCommonAncestor(new_mouse_hover_control, + mouse_captured_control_); + const auto o = FindLowestCommonAncestor(old_mouse_hover_control, + mouse_captured_control_); + bool a = IsAncestor(o, n); + if (a) { + DispatchEvent(o, &Control::MouseLeaveEvent, n); + } else { + DispatchEvent(n, &Control::MouseEnterEvent, o, point); + } + DispatchEvent(mouse_captured_control_, &Control::MouseMoveEvent, nullptr, + point); + UpdateCursor(); + return; + } + + DispatchMouseHoverControlChangeEvent( + old_mouse_hover_control, new_mouse_hover_control, point, false, false); + DispatchEvent(new_mouse_hover_control, &Control::MouseMoveEvent, nullptr, + point); + UpdateCursor(); +} + +void Window::OnNativeMouseDown( + platform::gui::INativeWindow* window, + const platform::gui::NativeMouseButtonEventArgs& args) { + CRU_UNUSED(window) + + Control* control = + mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); + DispatchEvent(control, &Control::MouseDownEvent, nullptr, args.point, + args.button, args.modifier); +} + +void Window::OnNativeMouseUp( + platform::gui::INativeWindow* window, + const platform::gui::NativeMouseButtonEventArgs& args) { + CRU_UNUSED(window) + + Control* control = + mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); + DispatchEvent(control, &Control::MouseUpEvent, nullptr, args.point, + args.button, args.modifier); +} + +void Window::OnNativeMouseWheel( + platform::gui::INativeWindow* window, + const platform::gui::NativeMouseWheelEventArgs& args) { + CRU_UNUSED(window) + + Control* control = + mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); + DispatchEvent(control, &Control::MouseWheelEvent, nullptr, args.point, + args.delta, args.modifier); +} + +void Window::OnNativeKeyDown(platform::gui::INativeWindow* window, + const platform::gui::NativeKeyEventArgs& args) { + CRU_UNUSED(window) + + DispatchEvent(focus_control_, &Control::KeyDownEvent, nullptr, args.key, + args.modifier); +} + +void Window::OnNativeKeyUp(platform::gui::INativeWindow* window, + const platform::gui::NativeKeyEventArgs& args) { + CRU_UNUSED(window) + + DispatchEvent(focus_control_, &Control::KeyUpEvent, nullptr, args.key, + args.modifier); +} + +void Window::DispatchFocusControlChangeEvent(Control* old_control, + Control* new_control, + bool is_window) { + if (new_control != old_control) { + const auto lowest_common_ancestor = + FindLowestCommonAncestor(old_control, new_control); + DispatchEvent(old_control, &Control::LoseFocusEvent, lowest_common_ancestor, + is_window); + DispatchEvent(new_control, &Control::GainFocusEvent, lowest_common_ancestor, + is_window); + } +} + +void Window::DispatchMouseHoverControlChangeEvent(Control* old_control, + Control* new_control, + const Point& point, + bool no_leave, + bool no_enter) { + if (new_control != old_control) // if the mouse-hover-on control changed + { + const auto lowest_common_ancestor = + FindLowestCommonAncestor(old_control, new_control); + if (!no_leave && old_control != nullptr) + DispatchEvent(old_control, &Control::MouseLeaveEvent, + lowest_common_ancestor); // dispatch mouse leave event. + if (!no_enter && new_control != nullptr) { + DispatchEvent(new_control, &Control::MouseEnterEvent, + lowest_common_ancestor, + point); // dispatch mouse enter event. + } + } +} + } // namespace cru::ui::controls diff --git a/src/ui/events/MouseEventArgs.cpp b/src/ui/events/MouseEventArgs.cpp index cad860d7..bbbf5cd4 100644 --- a/src/ui/events/MouseEventArgs.cpp +++ b/src/ui/events/MouseEventArgs.cpp @@ -1,7 +1,7 @@ #include "cru/ui/events/MouseEventArgs.h" #include "cru/ui/controls/Control.h" -#include "cru/ui/host/WindowHost.h" +#include "cru/ui/controls/Window.h" #include "cru/ui/render/RenderObject.h" namespace cru::ui::events { @@ -17,11 +17,9 @@ Point MouseEventArgs::GetPointToContent( Point MouseEventArgs::GetPointOfScreen() const { auto sender = GetSender(); if (auto control = dynamic_cast<controls::Control*>(sender)) { - if (auto host = control->GetWindowHost()) - return GetPoint() + control->GetWindowHost() - ->GetNativeWindow() - ->GetClientRect() - .GetLeftTop(); + if (auto window = control->GetWindow()) + return GetPoint() + + window->GetNativeWindow()->GetClientRect().GetLeftTop(); } return GetPoint(); } diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp index 796c3ad4..be1cbca2 100644 --- a/src/ui/helper/ClickDetector.cpp +++ b/src/ui/helper/ClickDetector.cpp @@ -3,16 +3,14 @@ #include "cru/base/log/Logger.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" -#include "cru/ui/host/WindowHost.h" - -#include <string> +#include "cru/ui/controls/Window.h" namespace cru::ui::helper { Point ClickEventArgs::GetDownPointOfScreen() const { - auto window_host = sender_->GetWindowHost(); - if (window_host != nullptr) { - auto window = window_host->GetNativeWindow(); - return down_point_ + window->GetClientRect().GetLeftTop(); + auto window = sender_->GetWindow(); + if (window != nullptr) { + return down_point_ + + window->GetNativeWindow()->GetClientRect().GetLeftTop(); } else { return down_point_; } diff --git a/src/ui/host/LayoutPaintCycler.cpp b/src/ui/host/LayoutPaintCycler.cpp deleted file mode 100644 index 7f8523d4..00000000 --- a/src/ui/host/LayoutPaintCycler.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "cru/ui/host/LayoutPaintCycler.h" -#include <chrono> - -#include "../Helper.h" -#include "cru/ui/Base.h" -#include "cru/ui/host/WindowHost.h" - -namespace cru::ui::host { -LayoutPaintCycler::LayoutPaintCycler(WindowHost* host) : host_(host) { - timer_canceler_ = GetUiApplication()->SetInterval( - std::chrono::duration_cast<std::chrono::milliseconds>( - this->cycle_threshold_), - [this] { OnCycle(); }); -} - -LayoutPaintCycler::~LayoutPaintCycler() = default; - -void LayoutPaintCycler::InvalidateLayout() { layout_dirty_ = true; } - -void LayoutPaintCycler::InvalidatePaint() { paint_dirty_ = true; } - -void LayoutPaintCycler::OnCycle() { - last_cycle_time_ = std::chrono::steady_clock::now(); - if (layout_dirty_) { - host_->Relayout(); - host_->Repaint(); - } else { - if (paint_dirty_) { - host_->Repaint(); - } - } - layout_dirty_ = false; - paint_dirty_ = false; -} -} // namespace cru::ui::host diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h deleted file mode 100644 index 6e8b4af1..00000000 --- a/src/ui/host/RoutedEventDispatch.h +++ /dev/null @@ -1,122 +0,0 @@ -#pragma once -#include "cru/base/log/Logger.h" -#include "cru/ui/DebugFlags.h" -#include "cru/ui/controls/Control.h" -#include "cru/ui/host/WindowHost.h" - -#include <vector> - -namespace cru::ui::host { -// Dispatch the event. -// -// This will raise routed event of the control and its parent and parent's -// parent ... (until "last_receiver" if it's not nullptr) with appropriate args. -// -// First tunnel from top to bottom possibly stopped by "handled" flag in -// EventArgs. Second bubble from bottom to top possibly stopped by "handled" -// flag in EventArgs. Last direct to each control. -// -// Args is of type "EventArgs". The first init argument is "sender", which is -// automatically bound to each receiving control. The second init argument is -// "original_sender", which is unchanged. And "args" will be perfectly forwarded -// as the rest arguments. -template <typename EventArgs, typename... Args> -void DispatchEvent( - const std::string& event_name, controls::Control* const original_sender, - events::RoutedEvent<EventArgs>* (controls::Control::*event_ptr)(), - controls::Control* const last_receiver, Args&&... args) { - constexpr auto kLogTag = "DispatchEvent"; - - if (original_sender == nullptr) return; - - CRU_UNUSED(event_name) - - if (original_sender == last_receiver) { - if constexpr (debug_flags::routed_event) - CRU_LOG_TAG_DEBUG( - "Routed event {} no need to dispatch (original_sender == " - "last_receiver). Original sender is {}.", - event_name, original_sender->GetControlType()); - return; - } - - WindowHost::EnterEventHandling(); - - std::vector<controls::Control*> receive_list; - - auto parent = original_sender; - while (parent != last_receiver) { - receive_list.push_back(parent); - auto p = parent->GetParent(); - assert(!(p == nullptr && last_receiver != nullptr)); - parent = p; - } - - if constexpr (debug_flags::routed_event) { - std::string log = "Dispatch routed event "; - log += event_name; - log += ". Path (parent first): "; - auto i = receive_list.crbegin(); - const auto end = --receive_list.crend(); - for (; i != end; ++i) { - log += (*i)->GetControlType(); - log += " -> "; - } - log += (*i)->GetControlType(); - CRU_LOG_TAG_DEBUG("{}", log); - } - - auto handled = false; - - int count = 0; - - // tunnel - for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) { - count++; - auto control = *i; - EventArgs event_args(control, original_sender, std::forward<Args>(args)...); - static_cast<Event<EventArgs&>*>((control->*event_ptr)()->Tunnel()) - ->Raise(event_args); - if (event_args.IsHandled()) { - handled = true; - if constexpr (debug_flags::routed_event) - CRU_LOG_TAG_DEBUG( - "Routed event is short-circuit in TUNNEL at {}-st control (count " - "from parent).", - count); - break; - } - } - - // bubble - if (!handled) { - for (auto control : receive_list) { - count--; - EventArgs event_args(control, original_sender, - std::forward<Args>(args)...); - static_cast<Event<EventArgs&>*>((control->*event_ptr)()->Bubble()) - ->Raise(event_args); - if (event_args.IsHandled()) { - if constexpr (debug_flags::routed_event) - CRU_LOG_TAG_DEBUG( - "Routed event is short-circuit in BUBBLE at {}-st control " - "(count from parent).", - count); - break; - } - } - } - - // direct - for (auto control : receive_list) { - EventArgs event_args(control, original_sender, std::forward<Args>(args)...); - static_cast<Event<EventArgs&>*>((control->*event_ptr)()->Direct()) - ->Raise(event_args); - } - - if constexpr (debug_flags::routed_event) - CRU_LOG_TAG_DEBUG("Routed event dispatch finished."); - - WindowHost::LeaveEventHandling(); -} -} // namespace cru::ui::host diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp deleted file mode 100644 index ec956bb4..00000000 --- a/src/ui/host/WindowHost.cpp +++ /dev/null @@ -1,457 +0,0 @@ -#include "cru/ui/host/WindowHost.h" - -#include "RoutedEventDispatch.h" -#include "cru/base/Base.h" -#include "cru/base/log/Logger.h" -#include "cru/platform/graphics/Painter.h" -#include "cru/platform/gui/UiApplication.h" -#include "cru/platform/gui/Window.h" -#include "cru/ui/Base.h" -#include "cru/ui/DebugFlags.h" -#include "cru/ui/host/LayoutPaintCycler.h" -#include "cru/ui/render/MeasureRequirement.h" -#include "cru/ui/render/RenderObject.h" - -#include <cstddef> -#include <memory> - -namespace cru::ui::host { -using platform::gui::INativeWindow; -using platform::gui::IUiApplication; - -namespace event_names { -#define CRU_DEFINE_EVENT_NAME(name) constexpr const char* name = #name; - -CRU_DEFINE_EVENT_NAME(LoseFocus) -CRU_DEFINE_EVENT_NAME(GainFocus) -CRU_DEFINE_EVENT_NAME(MouseEnter) -CRU_DEFINE_EVENT_NAME(MouseLeave) -CRU_DEFINE_EVENT_NAME(MouseMove) -CRU_DEFINE_EVENT_NAME(MouseDown) -CRU_DEFINE_EVENT_NAME(MouseUp) -CRU_DEFINE_EVENT_NAME(MouseWheel) -CRU_DEFINE_EVENT_NAME(KeyDown) -CRU_DEFINE_EVENT_NAME(KeyUp) - -#undef CRU_DEFINE_EVENT_NAME -} // namespace event_names - -namespace { -bool IsAncestor(controls::Control* control, controls::Control* ancestor) { - while (control != nullptr) { - if (control == ancestor) return true; - control = control->GetParent(); - } - return false; -} - -// Ancestor at last. -std::vector<controls::Control*> GetAncestorList(controls::Control* control) { - if (control == nullptr) return {}; - - std::vector<controls::Control*> l; - while (control != nullptr) { - l.push_back(control); - control = control->GetParent(); - } - return l; -} - -controls::Control* FindLowestCommonAncestor(controls::Control* left, - controls::Control* right) { - if (left == nullptr || right == nullptr) return nullptr; - - auto&& left_list = GetAncestorList(left); - auto&& right_list = GetAncestorList(right); - - // the root is different - if (left_list.back() != right_list.back()) return nullptr; - - // find the last same control or the last control (one is ancestor of the - // other) - auto left_iter = left_list.crbegin(); - auto right_iter = right_list.crbegin(); - - while (true) { - if (left_iter == left_list.crend()) { - return left_list.front(); - } - if (right_iter == right_list.crend()) { - return right_list.front(); - } - if (*left_iter != *right_iter) { - return *(--left_iter); - } - ++left_iter; - ++right_iter; - } -} -} // namespace - -namespace { -template <typename T> -inline void BindNativeEvent( - WindowHost* host, INativeWindow* native_window, IEvent<T>* event, - void (WindowHost::*handler)(INativeWindow*, typename IEvent<T>::Args), - std::vector<EventHandlerRevokerGuard>& guard_pool) { - guard_pool.push_back(EventHandlerRevokerGuard(event->AddHandler( - std::bind(handler, host, native_window, std::placeholders::_1)))); -} -} // namespace - -int WindowHost::event_handling_depth_ = 0; - -void WindowHost::EnterEventHandling() { event_handling_depth_++; } - -void WindowHost::LeaveEventHandling() { - Expects(event_handling_depth_ > 0); - event_handling_depth_--; -} - -WindowHost::WindowHost(controls::Control* root_control) - : root_control_(root_control), focus_control_(root_control) { - root_render_object_ = root_control->GetRenderObject(); - - this->layout_paint_cycler_ = std::make_unique<LayoutPaintCycler>(this); - - native_window_ = CreateNativeWindow(); -} - -WindowHost::~WindowHost() {} - -std::unique_ptr<platform::gui::INativeWindow> WindowHost::CreateNativeWindow() { - const auto ui_application = IUiApplication::GetInstance(); - - auto native_window = ui_application->CreateWindow(); - Ensures(native_window); - - BindNativeEvent(this, native_window, native_window->DestroyEvent(), - &WindowHost::OnNativeDestroy, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->PaintEvent(), - &WindowHost::OnNativePaint, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->ResizeEvent(), - &WindowHost::OnNativeResize, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->FocusEvent(), - &WindowHost::OnNativeFocus, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->MouseEnterLeaveEvent(), - &WindowHost::OnNativeMouseEnterLeave, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->MouseMoveEvent(), - &WindowHost::OnNativeMouseMove, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->MouseDownEvent(), - &WindowHost::OnNativeMouseDown, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->MouseUpEvent(), - &WindowHost::OnNativeMouseUp, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->MouseWheelEvent(), - &WindowHost::OnNativeMouseWheel, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->KeyDownEvent(), - &WindowHost::OnNativeKeyDown, event_revoker_guards_); - BindNativeEvent(this, native_window, native_window->KeyUpEvent(), - &WindowHost::OnNativeKeyUp, event_revoker_guards_); - - native_window_change_event_.Raise(native_window); - - return std::unique_ptr<INativeWindow>(native_window); -} - -void WindowHost::InvalidatePaint() { - if (layout_paint_cycler_) layout_paint_cycler_->InvalidatePaint(); -} - -void WindowHost::InvalidateLayout() { - if (layout_paint_cycler_) layout_paint_cycler_->InvalidateLayout(); -} - -bool WindowHost::IsLayoutPreferToFillWindow() const { - return layout_prefer_to_fill_window_; -} - -void WindowHost::SetLayoutPreferToFillWindow(bool value) { - if (value == layout_prefer_to_fill_window_) return; - layout_prefer_to_fill_window_ = value; - InvalidateLayout(); -} - -void WindowHost::Relayout() { - const auto available_size = - native_window_ ? native_window_->GetClientSize() : Size::Infinite(); - RelayoutWithSize(available_size); -} - -void WindowHost::RelayoutWithSize(const Size& available_size, - bool set_window_size_to_fit_content) { - root_render_object_->Measure( - render::MeasureRequirement{ - available_size, - !set_window_size_to_fit_content && IsLayoutPreferToFillWindow() - ? render::MeasureSize(available_size) - : render::MeasureSize::NotSpecified()}, - render::MeasureSize::NotSpecified()); - - if (set_window_size_to_fit_content) { - native_window_->SetClientSize(root_render_object_->GetDesiredSize()); - } - - root_render_object_->Layout(Point{}); - for (auto& action : after_layout_stable_action_) action(); - after_layout_event_.Raise(AfterLayoutEventArgs{}); - after_layout_stable_action_.clear(); - if constexpr (debug_flags::layout) - CRU_LOG_TAG_DEBUG("A relayout is finished."); -} - -void WindowHost::Repaint() { - if (native_window_ == nullptr) return; - auto painter = native_window_->BeginPaint(); - painter->Clear(colors::white); - root_render_object_->Draw(painter.get()); - painter->EndDraw(); -} - -controls::Control* WindowHost::GetFocusControl() { return focus_control_; } - -void WindowHost::SetFocusControl(controls::Control* control) { - if (focus_control_ == control) return; - if (control == nullptr) control = root_control_; - - const auto old_focus_control = focus_control_; - - focus_control_ = control; - - DispatchEvent(event_names::LoseFocus, old_focus_control, - &controls::Control::LoseFocusEvent, nullptr, false); - - DispatchEvent(event_names::GainFocus, control, - &controls::Control::GainFocusEvent, nullptr, false); -} - -bool WindowHost::CaptureMouseFor(controls::Control* control) { - if (!native_window_) return false; - if (!native_window_->CaptureMouse()) return false; - - if (control == mouse_captured_control_) return true; - - if (control == nullptr) { - native_window_->ReleaseMouse(); - const auto old_capture_control = mouse_captured_control_; - mouse_captured_control_ = - nullptr; // update this in case this is used in event handlers - if (old_capture_control != mouse_hover_control_) { - DispatchMouseHoverControlChangeEvent( - old_capture_control, mouse_hover_control_, - native_window_->GetMousePosition(), true, false); - } - UpdateCursor(); - return true; - } - - if (mouse_captured_control_) return false; - - mouse_captured_control_ = control; - DispatchMouseHoverControlChangeEvent( - mouse_hover_control_, mouse_captured_control_, - native_window_->GetMousePosition(), false, true); - UpdateCursor(); - return true; -} - -controls::Control* WindowHost::GetMouseCaptureControl() { - return mouse_captured_control_; -} - -void WindowHost::RunAfterLayoutStable(std::function<void()> action) { - if (layout_paint_cycler_->IsLayoutDirty()) { - after_layout_stable_action_.push_back(std::move(action)); - } else { - action(); - } -} - -void WindowHost::OnNativeDestroy(INativeWindow* window, std::nullptr_t) { - CRU_UNUSED(window) -} - -void WindowHost::OnNativePaint(INativeWindow* window, std::nullptr_t) { - CRU_UNUSED(window) - layout_paint_cycler_->InvalidatePaint(); -} - -void WindowHost::OnNativeResize(INativeWindow* window, const Size& size) { - CRU_UNUSED(window) - CRU_UNUSED(size) - - InvalidateLayout(); -} - -void WindowHost::OnNativeFocus(INativeWindow* window, - platform::gui::FocusChangeType focus) { - CRU_UNUSED(window) - - focus == platform::gui::FocusChangeType::Gain - ? DispatchEvent(event_names::GainFocus, focus_control_, - &controls::Control::GainFocusEvent, nullptr, true) - : DispatchEvent(event_names::LoseFocus, focus_control_, - &controls::Control::LoseFocusEvent, nullptr, true); -} - -void WindowHost::OnNativeMouseEnterLeave( - INativeWindow* window, platform::gui::MouseEnterLeaveType type) { - CRU_UNUSED(window) - - if (type == platform::gui::MouseEnterLeaveType::Leave) { - DispatchEvent(event_names::MouseLeave, mouse_hover_control_, - &controls::Control::MouseLeaveEvent, nullptr); - mouse_hover_control_ = nullptr; - } -} - -void WindowHost::OnNativeMouseMove(INativeWindow* window, const Point& point) { - CRU_UNUSED(window) - - // Find the first control that hit test succeed. - const auto new_mouse_hover_control = HitTest(point); - const auto old_mouse_hover_control = mouse_hover_control_; - mouse_hover_control_ = new_mouse_hover_control; - - if (mouse_captured_control_) { - const auto n = FindLowestCommonAncestor(new_mouse_hover_control, - mouse_captured_control_); - const auto o = FindLowestCommonAncestor(old_mouse_hover_control, - mouse_captured_control_); - bool a = IsAncestor(o, n); - if (a) { - DispatchEvent(event_names::MouseLeave, o, - &controls::Control::MouseLeaveEvent, n); - } else { - DispatchEvent(event_names::MouseEnter, n, - &controls::Control::MouseEnterEvent, o, point); - } - DispatchEvent(event_names::MouseMove, mouse_captured_control_, - &controls::Control::MouseMoveEvent, nullptr, point); - UpdateCursor(); - return; - } - - DispatchMouseHoverControlChangeEvent( - old_mouse_hover_control, new_mouse_hover_control, point, false, false); - DispatchEvent(event_names::MouseMove, new_mouse_hover_control, - &controls::Control::MouseMoveEvent, nullptr, point); - UpdateCursor(); -} - -void WindowHost::OnNativeMouseDown( - INativeWindow* window, - const platform::gui::NativeMouseButtonEventArgs& args) { - CRU_UNUSED(window) - - controls::Control* control = - mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); - DispatchEvent(event_names::MouseDown, control, - &controls::Control::MouseDownEvent, nullptr, args.point, - args.button, args.modifier); -} - -void WindowHost::OnNativeMouseUp( - INativeWindow* window, - const platform::gui::NativeMouseButtonEventArgs& args) { - CRU_UNUSED(window) - - controls::Control* control = - mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); - DispatchEvent(event_names::MouseUp, control, &controls::Control::MouseUpEvent, - nullptr, args.point, args.button, args.modifier); -} - -void WindowHost::OnNativeMouseWheel( - platform::gui::INativeWindow* window, - const platform::gui::NativeMouseWheelEventArgs& args) { - CRU_UNUSED(window) - - controls::Control* control = - mouse_captured_control_ ? mouse_captured_control_ : HitTest(args.point); - DispatchEvent(event_names::MouseWheel, control, - &controls::Control::MouseWheelEvent, nullptr, args.point, - args.delta, args.modifier); -} - -void WindowHost::OnNativeKeyDown( - INativeWindow* window, const platform::gui::NativeKeyEventArgs& args) { - CRU_UNUSED(window) - - DispatchEvent(event_names::KeyDown, focus_control_, - &controls::Control::KeyDownEvent, nullptr, args.key, - args.modifier); -} - -void WindowHost::OnNativeKeyUp(INativeWindow* window, - const platform::gui::NativeKeyEventArgs& args) { - CRU_UNUSED(window) - - DispatchEvent(event_names::KeyUp, focus_control_, - &controls::Control::KeyUpEvent, nullptr, args.key, - args.modifier); -} - -void WindowHost::DispatchMouseHoverControlChangeEvent( - controls::Control* old_control, controls::Control* new_control, - const Point& point, bool no_leave, bool no_enter) { - if (new_control != old_control) // if the mouse-hover-on control changed - { - const auto lowest_common_ancestor = - FindLowestCommonAncestor(old_control, new_control); - if (!no_leave && old_control != nullptr) - DispatchEvent(event_names::MouseLeave, old_control, - &controls::Control::MouseLeaveEvent, - lowest_common_ancestor); // dispatch mouse leave event. - if (!no_enter && new_control != nullptr) { - DispatchEvent(event_names::MouseEnter, new_control, - &controls::Control::MouseEnterEvent, lowest_common_ancestor, - point); // dispatch mouse enter event. - } - } -} - -void WindowHost::UpdateCursor() { - if (native_window_) { - if (override_cursor_) { - native_window_->SetCursor(override_cursor_); - } else { - const auto capture = GetMouseCaptureControl(); - native_window_->SetCursor( - (capture ? capture : GetMouseHoverControl())->GetInheritedCursor()); - } - } -} - -controls::Control* WindowHost::HitTest(const Point& point) { - const auto render_object = root_render_object_->HitTest(point); - if (render_object) { - const auto control = render_object->GetAttachedControl(); - Ensures(control); - return control; - } - return root_control_; -} - -std::shared_ptr<platform::gui::ICursor> WindowHost::GetOverrideCursor() { - return override_cursor_; -} - -void WindowHost::SetOverrideCursor( - std::shared_ptr<platform::gui::ICursor> cursor) { - if (cursor == override_cursor_) return; - override_cursor_ = cursor; - UpdateCursor(); -} - -void WindowHost::OnControlDetach(controls::Control* control) { - if (GetFocusControl() == control) { - SetFocusControl(nullptr); - } - if (GetMouseCaptureControl() == control) { - CaptureMouseFor(nullptr); - } - if (GetMouseHoverControl() == control) { - mouse_hover_control_ = HitTest(GetNativeWindow()->GetMousePosition()); - } -} -} // namespace cru::ui::host diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp index fcd44143..a4da2414 100644 --- a/src/ui/render/RenderObject.cpp +++ b/src/ui/render/RenderObject.cpp @@ -4,7 +4,7 @@ #include "cru/platform/GraphicsBase.h" #include "cru/ui/DebugFlags.h" #include "cru/ui/controls/Control.h" -#include "cru/ui/host/WindowHost.h" +#include "cru/ui/controls/Window.h" namespace cru::ui::render { const BoxConstraint BoxConstraint::kNotLimit{Size::kMax, Size::kZero}; @@ -265,22 +265,22 @@ Rect RenderObject::GetContentRect() const { return rect; } -host::WindowHost* RenderObject::GetWindowHost() { +controls::Window* RenderObject::GetWindow() { if (control_) { - return control_->GetWindowHost(); + return control_->GetWindow(); } return nullptr; } void RenderObject::InvalidateLayout() { - if (auto window_host = GetWindowHost()) { - window_host->InvalidateLayout(); + if (auto window = GetWindow()) { + window->InvalidateLayout(); } } void RenderObject::InvalidatePaint() { - if (auto window_host = GetWindowHost()) { - window_host->InvalidatePaint(); + if (auto window = GetWindow()) { + window->InvalidatePaint(); } } diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp index 804395e4..3834fffb 100644 --- a/src/ui/render/ScrollBar.cpp +++ b/src/ui/render/ScrollBar.cpp @@ -8,7 +8,7 @@ #include "cru/platform/gui/Cursor.h" #include "cru/ui/Base.h" #include "cru/ui/ThemeManager.h" -#include "cru/ui/host/WindowHost.h" +#include "cru/ui/controls/Window.h" #include "cru/ui/render/ScrollRenderObject.h" #include <algorithm> @@ -317,23 +317,23 @@ void ScrollBar::OnDraw(platform::graphics::IPainter* painter, void ScrollBar::SetCursor() { if (const auto control = render_object_->GetAttachedControl()) { - if (const auto window_host = control->GetWindowHost()) { - window_host->SetOverrideCursor( + if (const auto window = control->GetWindow()) { + window->SetOverrideCursor( GetUiApplication()->GetCursorManager()->GetSystemCursor( platform::gui::SystemCursorType::Arrow)); - cursor_overrided_ = true; + cursor_overridden_ = true; } } } void ScrollBar::RestoreCursor() { - if (cursor_overrided_) { + if (cursor_overridden_) { if (const auto control = render_object_->GetAttachedControl()) { - if (const auto window_host = control->GetWindowHost()) { - window_host->SetOverrideCursor(nullptr); + if (const auto window = control->GetWindow()) { + window->SetOverrideCursor(nullptr); } } - cursor_overrided_ = false; + cursor_overridden_ = false; } } |
