diff --git a/CMakeLists.txt b/CMakeLists.txt index 4eb2d5f..94d1358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,7 @@ set (SOURCES ${CMAKE_SOURCE_DIR}/src/ui/ui_elements.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_details_panel.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_menu.cpp + ${CMAKE_SOURCE_DIR}/src/ui/ui_api.cpp ${CMAKE_SOURCE_DIR}/src/ui/util/hsv.cpp ${CMAKE_SOURCE_DIR}/src/ui/core/ui_context.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_button.cpp diff --git a/include/recomp_ui.h b/include/recomp_ui.h index ffa9381..d4dc290 100644 --- a/include/recomp_ui.h +++ b/include/recomp_ui.h @@ -108,6 +108,7 @@ namespace recompui { Rml::ElementPtr create_custom_element(Rml::Element* parent, std::string tag); Rml::ElementDocument* load_document(const std::filesystem::path& path); + Rml::ElementDocument* create_empty_document(); } #endif diff --git a/src/main/main.cpp b/src/main/main.cpp index 69f130c..9668b20 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -620,6 +620,7 @@ int main(int argc, char** argv) { REGISTER_FUNC(recomp_get_mouse_deltas); REGISTER_FUNC(recomp_get_inverted_axes); REGISTER_FUNC(recomp_get_analog_inverted_axes); + recompui::register_ui_exports(); zelda64::register_overlays(); zelda64::register_patches(); diff --git a/src/ui/core/ui_context.cpp b/src/ui/core/ui_context.cpp index 55a634f..43d0442 100644 --- a/src/ui/core/ui_context.cpp +++ b/src/ui/core/ui_context.cpp @@ -178,6 +178,34 @@ recompui::ContextId recompui::create_context(Rml::ElementDocument* document) { return create_context_impl(document); } +recompui::ContextId recompui::create_context() { + Rml::ElementDocument* doc = create_empty_document(); + ContextId ret = create_context_impl(doc); + Element* root = ret.get_root_element(); + // Mark the root element as not being a shim, as that's only needed for elements that were parented to Rml ones manually. + root->shim = false; + + // TODO move these defaults elsewhere. Copied from the existing rcss. + ret.open(); + root->set_width(100.0f, Unit::Percent); + root->set_height(100.0f, Unit::Percent); + root->set_display(Display::Flex); + root->set_opacity(1.0f); + root->set_font_family("chiaro"); + root->set_font_style(FontStyle::Normal); + root->set_font_weight(400); + + float sz = 16.0f; + float spacing = 0.0f; + float sz_add = sz + 4; + root->set_font_size(sz_add, Unit::Dp); + root->set_letter_spacing(sz_add * spacing, Unit::Dp); + root->set_line_height(sz_add, Unit::Dp); + ret.close(); + + return ret; +} + void recompui::destroy_context(ContextId id) { bool existed = false; @@ -209,6 +237,8 @@ void recompui::destroy_context(ContextId id) { } void recompui::destroy_all_contexts() { + recompui::hide_all_contexts(); + std::lock_guard lock{ context_state.all_contexts_lock }; // TODO prevent deletion of a context while its mutex is in use. Second lock on the context's mutex before popping diff --git a/src/ui/core/ui_context.h b/src/ui/core/ui_context.h index 71df0eb..a94ee25 100644 --- a/src/ui/core/ui_context.h +++ b/src/ui/core/ui_context.h @@ -51,8 +51,11 @@ namespace recompui { ContextId create_context(const std::filesystem::path& path); ContextId create_context(Rml::ElementDocument* document); + ContextId create_context(); void destroy_context(ContextId id); ContextId get_current_context(); ContextId get_context_from_document(Rml::ElementDocument* document); void destroy_all_contexts(); + + void register_ui_exports(); } // namespace recompui diff --git a/src/ui/core/ui_resource.h b/src/ui/core/ui_resource.h index e6b6a69..1081326 100644 --- a/src/ui/core/ui_resource.h +++ b/src/ui/core/ui_resource.h @@ -8,6 +8,8 @@ namespace recompui { struct ResourceId { uint32_t slot_id; + bool operator==(const ResourceId& rhs) const = default; + const Style* operator*() const; Style* operator*(); diff --git a/src/ui/elements/ui_button.cpp b/src/ui/elements/ui_button.cpp index 41795f7..83b5f99 100644 --- a/src/ui/elements/ui_button.cpp +++ b/src/ui/elements/ui_button.cpp @@ -4,7 +4,7 @@ namespace recompui { - Button::Button(const std::string &text, ButtonStyle style, Element *parent) : Element(parent, Events(EventType::Click, EventType::Hover, EventType::Enable), "button") { + Button::Button(Element *parent, const std::string &text, ButtonStyle style) : Element(parent, Events(EventType::Click, EventType::Hover, EventType::Enable), "button") { this->style = style; set_text(text); diff --git a/src/ui/elements/ui_button.h b/src/ui/elements/ui_button.h index 461d5ab..a133b24 100644 --- a/src/ui/elements/ui_button.h +++ b/src/ui/elements/ui_button.h @@ -20,7 +20,7 @@ namespace recompui { // Element overrides. virtual void process_event(const Event &e) override; public: - Button(const std::string &text, ButtonStyle style, Element *parent); + Button(Element *parent, const std::string &text, ButtonStyle style); void add_pressed_callback(std::function callback); }; diff --git a/src/ui/elements/ui_container.cpp b/src/ui/elements/ui_container.cpp index 6828d87..3c76d2c 100644 --- a/src/ui/elements/ui_container.cpp +++ b/src/ui/elements/ui_container.cpp @@ -4,7 +4,7 @@ namespace recompui { - Container::Container(FlexDirection direction, JustifyContent justify_content, Element *parent) : Element(parent) { + Container::Container(Element *parent, FlexDirection direction, JustifyContent justify_content) : Element(parent) { set_display(Display::Flex); set_flex(1.0f, 1.0f); set_flex_direction(direction); diff --git a/src/ui/elements/ui_container.h b/src/ui/elements/ui_container.h index 289dd3c..b2cd102 100644 --- a/src/ui/elements/ui_container.h +++ b/src/ui/elements/ui_container.h @@ -6,7 +6,7 @@ namespace recompui { class Container : public Element { public: - Container(FlexDirection direction, JustifyContent justify_content, Element *parent); + Container(Element* parent, FlexDirection direction, JustifyContent justify_content); }; } // namespace recompui diff --git a/src/ui/elements/ui_element.cpp b/src/ui/elements/ui_element.cpp index 21152e0..8ba9d21 100644 --- a/src/ui/elements/ui_element.cpp +++ b/src/ui/elements/ui_element.cpp @@ -203,6 +203,9 @@ void Element::process_event(const Event &) { } void Element::clear_children() { + if (children.empty()) { + return; + } ContextId context = get_current_context(); // Remove the children from the context. diff --git a/src/ui/elements/ui_element.h b/src/ui/elements/ui_element.h index 2a12cf2..279a567 100644 --- a/src/ui/elements/ui_element.h +++ b/src/ui/elements/ui_element.h @@ -8,6 +8,7 @@ namespace recompui { class Element : public Style, public Rml::EventListener { friend ContextId create_context(const std::filesystem::path& path); + friend ContextId create_context(); private: Rml::Element *base = nullptr; Rml::ElementPtr base_owning = {}; diff --git a/src/ui/elements/ui_label.cpp b/src/ui/elements/ui_label.cpp index 455d636..e2302c3 100644 --- a/src/ui/elements/ui_label.cpp +++ b/src/ui/elements/ui_label.cpp @@ -4,7 +4,7 @@ namespace recompui { - Label::Label(LabelStyle label_style, Element *parent) : Element(parent) { + Label::Label(Element *parent, LabelStyle label_style) : Element(parent) { switch (label_style) { case LabelStyle::Small: set_font_size(20.0f); @@ -29,7 +29,7 @@ namespace recompui { set_font_style(FontStyle::Normal); } - Label::Label(const std::string &text, LabelStyle label_style, Element *parent) : Label(label_style, parent) { + Label::Label(Element *parent, const std::string &text, LabelStyle label_style) : Label(parent, label_style) { set_text(text); } diff --git a/src/ui/elements/ui_label.h b/src/ui/elements/ui_label.h index bbfeb18..c2150c3 100644 --- a/src/ui/elements/ui_label.h +++ b/src/ui/elements/ui_label.h @@ -12,8 +12,8 @@ namespace recompui { class Label : public Element { public: - Label(LabelStyle label_style, Element *parent); - Label(const std::string &text, LabelStyle label_style, Element *parent); + Label(Element *parent, LabelStyle label_style); + Label(Element *parent, const std::string &text, LabelStyle label_style); }; } // namespace recompui \ No newline at end of file diff --git a/src/ui/elements/ui_radio.cpp b/src/ui/elements/ui_radio.cpp index 080d90a..ce57697 100644 --- a/src/ui/elements/ui_radio.cpp +++ b/src/ui/elements/ui_radio.cpp @@ -4,7 +4,7 @@ namespace recompui { // RadioOption - RadioOption::RadioOption(std::string_view name, uint32_t index, Element *parent) : Element(parent, Events(EventType::Click, EventType::Focus, EventType::Hover, EventType::Enable), "label") { + RadioOption::RadioOption(Element *parent, std::string_view name, uint32_t index) : Element(parent, Events(EventType::Click, EventType::Focus, EventType::Hover, EventType::Enable), "label") { this->index = index; set_text(name); @@ -68,7 +68,7 @@ namespace recompui { set_index_internal(index, false, true); } - Radio::Radio(Element *parent) : Container(FlexDirection::Row, JustifyContent::FlexStart, parent) { + Radio::Radio(Element *parent) : Container(parent, FlexDirection::Row, JustifyContent::FlexStart) { set_gap(12.0f); } @@ -77,7 +77,7 @@ namespace recompui { } void Radio::add_option(std::string_view name) { - RadioOption *option = get_current_context().create_element(name, uint32_t(options.size()), this); + RadioOption *option = get_current_context().create_element(this, name, uint32_t(options.size())); option->set_pressed_callback(std::bind(&Radio::option_selected, this, std::placeholders::_1)); options.emplace_back(option); diff --git a/src/ui/elements/ui_radio.h b/src/ui/elements/ui_radio.h index ba3a704..b4303d9 100644 --- a/src/ui/elements/ui_radio.h +++ b/src/ui/elements/ui_radio.h @@ -13,7 +13,7 @@ namespace recompui { protected: virtual void process_event(const Event &e) override; public: - RadioOption(std::string_view name, uint32_t index, Element *parent); + RadioOption(Element *parent, std::string_view name, uint32_t index); void set_pressed_callback(std::function callback); void set_selected_state(bool enable); }; diff --git a/src/ui/elements/ui_scroll_container.cpp b/src/ui/elements/ui_scroll_container.cpp index bbe41c9..cbc1f67 100644 --- a/src/ui/elements/ui_scroll_container.cpp +++ b/src/ui/elements/ui_scroll_container.cpp @@ -4,7 +4,7 @@ namespace recompui { - ScrollContainer::ScrollContainer(ScrollDirection direction, Element *parent) : Element(parent) { + ScrollContainer::ScrollContainer(Element *parent, ScrollDirection direction) : Element(parent) { set_flex(1.0f, 1.0f, 100.0f); set_width(100.0f, Unit::Percent); set_height(100.0f, Unit::Percent); diff --git a/src/ui/elements/ui_scroll_container.h b/src/ui/elements/ui_scroll_container.h index 538af01..5a089ab 100644 --- a/src/ui/elements/ui_scroll_container.h +++ b/src/ui/elements/ui_scroll_container.h @@ -11,7 +11,7 @@ namespace recompui { class ScrollContainer : public Element { public: - ScrollContainer(ScrollDirection direction, Element *parent); + ScrollContainer(Element *parent, ScrollDirection direction); }; } // namespace recompui diff --git a/src/ui/elements/ui_slider.cpp b/src/ui/elements/ui_slider.cpp index 62d8b2b..96ff0df 100644 --- a/src/ui/elements/ui_slider.cpp +++ b/src/ui/elements/ui_slider.cpp @@ -60,7 +60,7 @@ namespace recompui { } } - Slider::Slider(SliderType type, Element *parent) : Element(parent) { + Slider::Slider(Element *parent, SliderType type) : Element(parent) { this->type = type; set_display(Display::Flex); @@ -69,7 +69,7 @@ namespace recompui { ContextId context = get_current_context(); - value_label = context.create_element