From 2188845a7acffa653015a1000139ec0a9a3984bc Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 8 Nov 2020 17:45:41 +0800 Subject: ... --- src/ui/controls/Window.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/ui/controls/Window.cpp (limited to 'src/ui/controls/Window.cpp') diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp new file mode 100644 index 00000000..7ce40dfe --- /dev/null +++ b/src/ui/controls/Window.cpp @@ -0,0 +1,32 @@ +#include "cru/ui/controls/Window.hpp" + +#include "cru/common/Base.hpp" +#include "cru/ui/host/WindowHost.hpp" +#include "cru/ui/render/Base.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" + +namespace cru::ui::controls { +Window* Window::CreateOverlapped() { return new Window(); } + +Window::Window() : render_object_(new render::StackLayoutRenderObject()) { + render_object_->SetAttachedControl(this); + window_host_ = std::make_unique(this); +} + +Window::~Window() {} + +std::u16string_view Window::GetControlType() const { return control_type; } + +render::RenderObject* Window::GetRenderObject() const { + return render_object_.get(); +} + +void Window::OnAddChild(Control* child, Index position) { + render_object_->AddChild(child->GetRenderObject(), position); +} + +void Window::OnRemoveChild(Control* child, Index position) { + CRU_UNUSED(child); + render_object_->RemoveChild(position); +} +} // namespace cru::ui::controls -- cgit v1.2.3 From ddc6d6478f849ef10b832bc8b1d8ab7fe9454601 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 9 Nov 2020 18:28:33 +0800 Subject: ... --- demos/main/main.cpp | 2 +- include/cru/ui/controls/Window.hpp | 8 ++++---- include/cru/ui/host/WindowHost.hpp | 13 +++++++++++-- src/ui/controls/Popup.cpp | 5 ++--- src/ui/controls/Window.cpp | 15 ++++++++------- src/ui/host/WindowHost.cpp | 31 ++++++++++++++++++++++--------- 6 files changed, 48 insertions(+), 26 deletions(-) (limited to 'src/ui/controls/Window.cpp') diff --git a/demos/main/main.cpp b/demos/main/main.cpp index dd3e31e9..2d5939f1 100644 --- a/demos/main/main.cpp +++ b/demos/main/main.cpp @@ -45,7 +45,7 @@ int main() { const auto text_box = TextBox::Create(); flex_layout->AddChild(text_box, 2); - window->GetWindowHost()->GetNativeWindow()->SetVisible(true); + window->Show(); return application->Run(); } diff --git a/include/cru/ui/controls/Window.hpp b/include/cru/ui/controls/Window.hpp index 616e2ee7..996bc75e 100644 --- a/include/cru/ui/controls/Window.hpp +++ b/include/cru/ui/controls/Window.hpp @@ -24,13 +24,13 @@ class Window final : public LayoutControl { render::RenderObject* GetRenderObject() const override; - protected: - void OnAddChild(Control* child, Index position) override; - void OnRemoveChild(Control* child, Index position) override; + // If create is false and native window is not create, it will not be created + // and shown. + void Show(bool create = true); private: std::unique_ptr window_host_; std::unique_ptr render_object_; }; -} // namespace cru::ui +} // namespace cru::ui::controls diff --git a/include/cru/ui/host/WindowHost.hpp b/include/cru/ui/host/WindowHost.hpp index 6d338df1..9fc24eb2 100644 --- a/include/cru/ui/host/WindowHost.hpp +++ b/include/cru/ui/host/WindowHost.hpp @@ -28,8 +28,7 @@ class WindowHost : public Object { CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::host::WindowHost") public: - WindowHost(controls::Control* root_control, - CreateWindowParams create_window_params = {}); + WindowHost(controls::Control* root_control); CRU_DELETE_COPY(WindowHost) CRU_DELETE_MOVE(WindowHost) @@ -39,6 +38,10 @@ class WindowHost : public Object { public: platform::gui::INativeWindow* GetNativeWindow() { return native_window_; } + // Do nothing if native window is already created. + gsl::not_null CreateNativeWindow( + CreateWindowParams create_window_params = {}); + // Mark the layout as invalid, and arrange a re-layout later. // This method could be called more than one times in a message cycle. But // layout only takes place once. @@ -102,6 +105,10 @@ class WindowHost : public Object { void UpdateCursor(); + IEvent* NativeWindowChangeEvent() { + return &native_window_change_event_; + } + private: //*************** region: native messages *************** void OnNativeDestroy(platform::gui::INativeWindow* window, std::nullptr_t); @@ -152,5 +159,7 @@ class WindowHost : public Object { controls::Control* mouse_captured_control_ = nullptr; bool layout_prefer_to_fill_window_ = true; + + Event native_window_change_event_; }; } // namespace cru::ui::host diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp index f51f2b3b..982aee38 100644 --- a/src/ui/controls/Popup.cpp +++ b/src/ui/controls/Popup.cpp @@ -9,11 +9,10 @@ namespace cru::ui::controls { Popup::Popup(Control* attached_control) : attached_control_(attached_control) { render_object_ = std::make_unique(); + render_object_->SetAttachedControl(this); SetContainerRenderObject(render_object_.get()); - window_host_ = std::make_unique( - this, host::CreateWindowParams( - nullptr, platform::gui::CreateWindowFlags::NoCaptionAndBorder)); + window_host_ = std::make_unique(this); } Popup::~Popup() = default; diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp index 7ce40dfe..b302cb62 100644 --- a/src/ui/controls/Window.cpp +++ b/src/ui/controls/Window.cpp @@ -1,6 +1,7 @@ #include "cru/ui/controls/Window.hpp" #include "cru/common/Base.hpp" +#include "cru/platform/gui/Base.hpp" #include "cru/ui/host/WindowHost.hpp" #include "cru/ui/render/Base.hpp" #include "cru/ui/render/StackLayoutRenderObject.hpp" @@ -10,6 +11,7 @@ Window* Window::CreateOverlapped() { return new Window(); } Window::Window() : render_object_(new render::StackLayoutRenderObject()) { render_object_->SetAttachedControl(this); + SetContainerRenderObject(render_object_.get()); window_host_ = std::make_unique(this); } @@ -21,12 +23,11 @@ render::RenderObject* Window::GetRenderObject() const { return render_object_.get(); } -void Window::OnAddChild(Control* child, Index position) { - render_object_->AddChild(child->GetRenderObject(), position); -} - -void Window::OnRemoveChild(Control* child, Index position) { - CRU_UNUSED(child); - render_object_->RemoveChild(position); +void Window::Show(bool create) { + platform::gui::INativeWindow* native_window = + create ? window_host_->CreateNativeWindow().get() + : window_host_->GetNativeWindow(); + if (!native_window) return; + native_window->SetVisible(true); } } // namespace cru::ui::controls diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp index 95de51c2..4bd981c2 100644 --- a/src/ui/host/WindowHost.cpp +++ b/src/ui/host/WindowHost.cpp @@ -103,14 +103,8 @@ inline void BindNativeEvent( } } // namespace -WindowHost::WindowHost(controls::Control* root_control, - CreateWindowParams create_window_params) +WindowHost::WindowHost(controls::Control* root_control) : root_control_(root_control), focus_control_(root_control) { - const auto ui_application = IUiApplication::GetInstance(); - auto native_window = ui_application->CreateWindow(create_window_params.parent, - create_window_params.flag); - native_window_ = native_window; - root_control_->TraverseDescendants([this](controls::Control* control) { control->window_host_ = this; control->OnAttachToHost(this); @@ -120,6 +114,20 @@ WindowHost::WindowHost(controls::Control* root_control, root_render_object_->SetWindowHostRecursive(this); this->layout_paint_cycler_ = std::make_unique(this); +} + +WindowHost::~WindowHost() {} + +gsl::not_null WindowHost::CreateNativeWindow( + CreateWindowParams create_window_params) { + if (native_window_ != nullptr) return native_window_; + + const auto ui_application = IUiApplication::GetInstance(); + + auto native_window = ui_application->CreateWindow(create_window_params.parent, + create_window_params.flag); + + native_window_ = native_window; BindNativeEvent(this, native_window, native_window->DestroyEvent(), &WindowHost::OnNativeDestroy, event_revoker_guards_); @@ -141,9 +149,11 @@ WindowHost::WindowHost(controls::Control* root_control, &WindowHost::OnNativeKeyDown, event_revoker_guards_); BindNativeEvent(this, native_window, native_window->KeyUpEvent(), &WindowHost::OnNativeKeyUp, event_revoker_guards_); -} -WindowHost::~WindowHost() {} + native_window_change_event_.Raise(native_window); + + return native_window_; +} void WindowHost::InvalidatePaint() { layout_paint_cycler_->InvalidatePaint(); } @@ -254,6 +264,9 @@ void WindowHost::RunAfterLayoutStable(std::function action) { void WindowHost::OnNativeDestroy(INativeWindow* window, std::nullptr_t) { CRU_UNUSED(window) this->native_window_ = nullptr; + event_revoker_guards_.clear(); + + native_window_change_event_.Raise(nullptr); } void WindowHost::OnNativePaint(INativeWindow* window, std::nullptr_t) { -- cgit v1.2.3 From 68fc33443981fcd499dfe263c228787e213ae943 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 9 Nov 2020 20:06:04 +0800 Subject: ... --- demos/main/main.cpp | 2 +- include/cru/ui/controls/Popup.hpp | 17 +++++++------ include/cru/ui/controls/RootControl.hpp | 40 +++++++++++++++++++++++++++++ include/cru/ui/controls/Window.hpp | 34 +++++++++++-------------- src/ui/CMakeLists.txt | 2 ++ src/ui/controls/Popup.cpp | 15 ++++++----- src/ui/controls/RootControl.cpp | 45 +++++++++++++++++++++++++++++++++ src/ui/controls/Window.cpp | 27 +++++++------------- 8 files changed, 130 insertions(+), 52 deletions(-) create mode 100644 include/cru/ui/controls/RootControl.hpp create mode 100644 src/ui/controls/RootControl.cpp (limited to 'src/ui/controls/Window.cpp') diff --git a/demos/main/main.cpp b/demos/main/main.cpp index 2d5939f1..66354289 100644 --- a/demos/main/main.cpp +++ b/demos/main/main.cpp @@ -23,7 +23,7 @@ int main() { auto application = CreateUiApplication(); - const auto window = Window::CreateOverlapped(); + const auto window = Window::Create(); const auto flex_layout = FlexLayout::Create(); flex_layout->SetFlexDirection(cru::ui::FlexDirection::Vertical); diff --git a/include/cru/ui/controls/Popup.hpp b/include/cru/ui/controls/Popup.hpp index f17cd1b2..d76e1211 100644 --- a/include/cru/ui/controls/Popup.hpp +++ b/include/cru/ui/controls/Popup.hpp @@ -1,10 +1,13 @@ #pragma once -#include "LayoutControl.hpp" +#include "RootControl.hpp" + +#include "cru/ui/Base.hpp" +#include "cru/platform/gui/Base.hpp" #include namespace cru::ui::controls { -class Popup : public LayoutControl { +class Popup : public RootControl { public: explicit Popup(Control* attached_control = nullptr); @@ -13,11 +16,9 @@ class Popup : public LayoutControl { ~Popup() override; - private: - std::unique_ptr window_host_; - - std::unique_ptr render_object_; - - Control* attached_control_; + protected: + gsl::not_null CreateNativeWindow( + gsl::not_null host, + platform::gui::INativeWindow* parent) override; }; } // namespace cru::ui::controls diff --git a/include/cru/ui/controls/RootControl.hpp b/include/cru/ui/controls/RootControl.hpp new file mode 100644 index 00000000..ff1b545a --- /dev/null +++ b/include/cru/ui/controls/RootControl.hpp @@ -0,0 +1,40 @@ +#pragma once +#include "LayoutControl.hpp" + +#include "cru/common/Base.hpp" +#include "cru/platform/gui/Base.hpp" +#include "cru/ui/Base.hpp" + +namespace cru::ui::controls { +class RootControl : public LayoutControl { + protected: + explicit RootControl(Control* attached_control); + + public: + CRU_DELETE_COPY(RootControl) + CRU_DELETE_MOVE(RootControl) + ~RootControl() override; + + public: + render::RenderObject* GetRenderObject() const override; + + // If create is false and native window is not create, it will not be created + // and shown. + void Show(bool create = true); + + protected: + virtual gsl::not_null CreateNativeWindow( + gsl::not_null host, + platform::gui::INativeWindow* parent) = 0; + + private: + platform::gui::INativeWindow* GetNativeWindow(bool create); + + private: + std::unique_ptr window_host_; + + std::unique_ptr render_object_; + + Control* attached_control_; +}; +} // namespace cru::ui::controls diff --git a/include/cru/ui/controls/Window.hpp b/include/cru/ui/controls/Window.hpp index 996bc75e..cca56b64 100644 --- a/include/cru/ui/controls/Window.hpp +++ b/include/cru/ui/controls/Window.hpp @@ -1,36 +1,32 @@ #pragma once -#include "LayoutControl.hpp" +#include "cru/platform/gui/Base.hpp" +#include "cru/ui/controls/RootControl.hpp" + +#include "cru/common/Base.hpp" namespace cru::ui::controls { -class Window final : public LayoutControl { +class Window final : public RootControl { public: static constexpr std::u16string_view control_type = u"Window"; public: - static Window* CreateOverlapped(); + static Window* Create(Control* attached_control = nullptr); private: - Window(); + explicit Window(Control* attached_control); public: - Window(const Window& other) = delete; - Window(Window&& other) = delete; - Window& operator=(const Window& other) = delete; - Window& operator=(Window&& other) = delete; + CRU_DELETE_COPY(Window) + CRU_DELETE_MOVE(Window) + ~Window() override; public: - std::u16string_view GetControlType() const final; - - render::RenderObject* GetRenderObject() const override; - - // If create is false and native window is not create, it will not be created - // and shown. - void Show(bool create = true); - - private: - std::unique_ptr window_host_; + std::u16string_view GetControlType() const final { return control_type; } - std::unique_ptr render_object_; + protected: + gsl::not_null CreateNativeWindow( + gsl::not_null host, + platform::gui::INativeWindow* parent) override; }; } // namespace cru::ui::controls diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 15ad1258..d9edf49e 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(cru_ui STATIC controls/LayoutControl.cpp controls/NoChildControl.cpp controls/Popup.cpp + controls/RootControl.cpp controls/StackLayout.cpp controls/TextBlock.cpp controls/TextBox.cpp @@ -46,6 +47,7 @@ target_sources(cru_ui PUBLIC ${CRU_UI_INCLUDE_DIR}/controls/LayoutControl.hpp ${CRU_UI_INCLUDE_DIR}/controls/NoChildControl.hpp ${CRU_UI_INCLUDE_DIR}/controls/Popup.hpp + ${CRU_UI_INCLUDE_DIR}/controls/RootControl.hpp ${CRU_UI_INCLUDE_DIR}/controls/StackLayout.hpp ${CRU_UI_INCLUDE_DIR}/controls/TextBox.hpp ${CRU_UI_INCLUDE_DIR}/controls/TextBlock.hpp diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp index 982aee38..bc217bf5 100644 --- a/src/ui/controls/Popup.cpp +++ b/src/ui/controls/Popup.cpp @@ -1,19 +1,22 @@ #include "cru/ui/controls/Popup.hpp" #include "cru/platform/gui/UiApplication.hpp" +#include "cru/ui/controls/RootControl.hpp" #include "cru/ui/host/WindowHost.hpp" #include "cru/ui/render/StackLayoutRenderObject.hpp" #include namespace cru::ui::controls { -Popup::Popup(Control* attached_control) : attached_control_(attached_control) { - render_object_ = std::make_unique(); - render_object_->SetAttachedControl(this); - SetContainerRenderObject(render_object_.get()); +Popup::Popup(Control* attached_control) : RootControl(attached_control) {} - window_host_ = std::make_unique(this); +Popup::~Popup() = default; + +gsl::not_null Popup::CreateNativeWindow( + gsl::not_null host, + platform::gui::INativeWindow* parent) { + return host->CreateNativeWindow( + {parent, platform::gui::CreateWindowFlags::NoCaptionAndBorder}); } -Popup::~Popup() = default; } // namespace cru::ui::controls diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp new file mode 100644 index 00000000..61d272f8 --- /dev/null +++ b/src/ui/controls/RootControl.cpp @@ -0,0 +1,45 @@ +#include "cru/ui/controls/RootControl.hpp" + +#include "cru/common/Base.hpp" +#include "cru/platform/gui/Base.hpp" +#include "cru/ui/host/WindowHost.hpp" +#include "cru/ui/render/Base.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "gsl/pointers" + +#include + +namespace cru::ui::controls { +RootControl::RootControl(Control* attached_control) + : attached_control_(attached_control) { + render_object_ = std::make_unique(); + render_object_->SetAttachedControl(this); + SetContainerRenderObject(render_object_.get()); + window_host_ = std::make_unique(this); +} + +RootControl::~RootControl() {} + +render::RenderObject* RootControl::GetRenderObject() const { + return render_object_.get(); +} + +void RootControl::Show(bool create) { + platform::gui::INativeWindow* native_window = GetNativeWindow(create); + if (!native_window) return; + native_window->SetVisible(true); +} + +platform::gui::INativeWindow* RootControl::GetNativeWindow(bool create) { + const auto host = GetWindowHost(); + platform::gui::INativeWindow* native_window = host->GetNativeWindow(); + if (!create) return native_window; + if (!native_window) { + native_window = this->CreateNativeWindow( + host, attached_control_ + ? attached_control_->GetWindowHost()->GetNativeWindow() + : nullptr); + } + return native_window; +} +} // namespace cru::ui::controls diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp index b302cb62..ba66f42e 100644 --- a/src/ui/controls/Window.cpp +++ b/src/ui/controls/Window.cpp @@ -2,32 +2,23 @@ #include "cru/common/Base.hpp" #include "cru/platform/gui/Base.hpp" +#include "cru/ui/controls/RootControl.hpp" #include "cru/ui/host/WindowHost.hpp" #include "cru/ui/render/Base.hpp" #include "cru/ui/render/StackLayoutRenderObject.hpp" namespace cru::ui::controls { -Window* Window::CreateOverlapped() { return new Window(); } - -Window::Window() : render_object_(new render::StackLayoutRenderObject()) { - render_object_->SetAttachedControl(this); - SetContainerRenderObject(render_object_.get()); - window_host_ = std::make_unique(this); +Window* Window::Create(Control* attached_control) { + return new Window(attached_control); } -Window::~Window() {} - -std::u16string_view Window::GetControlType() const { return control_type; } +Window::Window(Control* attached_control) : RootControl(attached_control) {} -render::RenderObject* Window::GetRenderObject() const { - return render_object_.get(); -} +Window::~Window() {} -void Window::Show(bool create) { - platform::gui::INativeWindow* native_window = - create ? window_host_->CreateNativeWindow().get() - : window_host_->GetNativeWindow(); - if (!native_window) return; - native_window->SetVisible(true); +gsl::not_null Window::CreateNativeWindow( + gsl::not_null host, + platform::gui::INativeWindow* parent) { + return host->CreateNativeWindow({parent}); } } // namespace cru::ui::controls -- cgit v1.2.3