diff options
-rw-r--r-- | include/cru/ui/components/Component.hpp | 19 | ||||
-rw-r--r-- | include/cru/ui/components/Menu.hpp | 60 | ||||
-rw-r--r-- | src/ui/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/ui/component/Component.cpp | 5 | ||||
-rw-r--r-- | src/ui/component/Menu.cpp | 57 |
5 files changed, 145 insertions, 0 deletions
diff --git a/include/cru/ui/components/Component.hpp b/include/cru/ui/components/Component.hpp new file mode 100644 index 00000000..0dfc587b --- /dev/null +++ b/include/cru/ui/components/Component.hpp @@ -0,0 +1,19 @@ +#pragma once +#include "../Base.hpp" + +namespace cru::ui::components { +// In destructor, component should check all owned controls whether it is +// attached to window, if not, destroy them, otherwise it is host's duty to +// destroy them. +class Component : public Object { + public: + Component() = default; + + CRU_DELETE_COPY(Component) + CRU_DELETE_MOVE(Component) + + ~Component() = default; + + virtual controls::Control* GetRootControl() = 0; +}; +} // namespace cru::ui::components diff --git a/include/cru/ui/components/Menu.hpp b/include/cru/ui/components/Menu.hpp new file mode 100644 index 00000000..dedf2bd5 --- /dev/null +++ b/include/cru/ui/components/Menu.hpp @@ -0,0 +1,60 @@ +#pragma once +#include "Component.hpp" +#include "cru/common/Base.hpp" +#include "cru/ui/controls/Button.hpp" +#include "cru/ui/controls/Control.hpp" +#include "cru/ui/controls/FlexLayout.hpp" +#include "cru/ui/controls/TextBlock.hpp" + +#include <string> +#include <vector> + +namespace cru::ui::components { +class MenuItem : public Component { + public: + MenuItem(); + explicit MenuItem(std::u16string text); + + CRU_DELETE_COPY(MenuItem) + CRU_DELETE_MOVE(MenuItem) + + ~MenuItem(); + + public: + controls::Control* GetRootControl() override { return container_; } + + void SetText(std::u16string text); + + private: + controls::Button* container_; + controls::TextBlock* text_; +}; + +class Menu : public Component { + public: + Menu(); + + CRU_DELETE_COPY(Menu) + CRU_DELETE_MOVE(Menu) + + ~Menu(); + + public: + gsl::index GetItemCount() const { + return static_cast<gsl::index>(items_.size()); + } + + void AddItem(Component* component) { AddItem(component, GetItemCount()); } + void AddItem(Component* component, gsl::index index); + Component* RemoveItem(gsl::index index); + + void AddTextItem(std::u16string text) { + AddTextItem(std::move(text), GetItemCount()); + } + void AddTextItem(std::u16string text, gsl::index index); + + private: + controls::FlexLayout* container_; + std::vector<Component*> items_; +}; +} // namespace cru::ui::components diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index d183fdbb..28200eb5 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -6,6 +6,8 @@ add_library(cru_ui STATIC Helper.cpp UiManager.cpp + components/Component.cpp + components/Menu.cpp controls/Button.cpp controls/Container.cpp controls/ContentControl.cpp @@ -43,6 +45,8 @@ target_sources(cru_ui PUBLIC ${CRU_UI_INCLUDE_DIR}/Base.hpp ${CRU_UI_INCLUDE_DIR}/DebugFlags.hpp ${CRU_UI_INCLUDE_DIR}/UiManager.hpp + ${CRU_UI_INCLUDE_DIR}/components/Component.hpp + ${CRU_UI_INCLUDE_DIR}/components/Menu.hpp ${CRU_UI_INCLUDE_DIR}/controls/Base.hpp ${CRU_UI_INCLUDE_DIR}/controls/Button.hpp ${CRU_UI_INCLUDE_DIR}/controls/Container.hpp diff --git a/src/ui/component/Component.cpp b/src/ui/component/Component.cpp new file mode 100644 index 00000000..5b62ffc9 --- /dev/null +++ b/src/ui/component/Component.cpp @@ -0,0 +1,5 @@ +#include "cru/ui/components/Component.hpp" + +namespace cru::ui::components { + +} diff --git a/src/ui/component/Menu.cpp b/src/ui/component/Menu.cpp new file mode 100644 index 00000000..ea9dcdb6 --- /dev/null +++ b/src/ui/component/Menu.cpp @@ -0,0 +1,57 @@ +#include "cru/ui/components/Menu.hpp" +#include "cru/ui/controls/Button.hpp" +#include "cru/ui/controls/FlexLayout.hpp" +#include "cru/ui/controls/TextBlock.hpp" + +#include <string> + +namespace cru::ui::components { +MenuItem::MenuItem() { + container_ = controls::Button::Create(); + text_ = controls::TextBlock::Create(); + container_->SetChild(text_); +} + +MenuItem::MenuItem(std::u16string text) : MenuItem() { + SetText(std::move(text)); +} + +MenuItem::~MenuItem() { + if (!container_->GetWindowHost()) { + delete container_; + delete text_; + } +} + +void MenuItem::SetText(std::u16string text) { text_->SetText(std::move(text)); } + +Menu::Menu() { container_ = controls::FlexLayout::Create(); } + +Menu::~Menu() { + if (!container_->GetWindowHost()) { + delete container_; + } + + for (auto item : items_) { + delete item; + } +} + +void Menu::AddItem(Component* item, gsl::index index) { + Expects(index >= 0 && index <= GetItemCount()); + + items_.insert(items_.cbegin() + index, item); + container_->AddChild(item->GetRootControl(), index); +} + +Component* Menu::RemoveItem(gsl::index index) { + Expects(index >= 0 && index < GetItemCount()); + + Component* item = items_[index]; + + items_.erase(items_.cbegin() + index); + container_->RemoveChild(index); + + return item; +} +} // namespace cru::ui::components |