1.2 Release Candidate (#572)

* Remove dummy description for mod config options

* Tag release candidate version

* Apply min width to element triggering rmlui assert (#573)

* Restore 0th day (#574)

* Handle controller up events even while binding inputs to avoid spamming the bind button

* Add MouseButton UI event and use it to fix focus issue on radio, also fix sliders not moving until mouse is released

* Bump version string to 1.2.0-rc2

* mod configure menu description padding set to 16

* Added the ability for focus to set the current mod config option description (#576)

* Added the ability for focus to set the current mod config option description

* add focus to text input

* only clear description if element matches

* Fix race condition crash when setting element text, bump version to 1.2.0-rc3

* Revert "Fix race condition crash when setting element text, bump version to 1.2.0-rc3"

This reverts commit 4934a04d8a.

* Defer setting an element's text if it has children to fix race condition crash, bump version to 1.2.0-rc3

* Defer remaining set_text calls to prevent another race conditionresource

* Update runtime to fix some issues that could happen after mod conflicts
and bump version to 1.2.0-rc4

* Update runtime to fix regenerated functions using the wrong event index and bump version to 1.2.0-rc5

* Add support for suffixed .so. files. Also prevent dropping extracted dynamic libraries.

* Update RT64 commit to fix cstdint include for re-spirv.

* Bump version to rc6.

* Dummy commit to fix CI bot

* Use compile-time macro for Flatpak instead.

* Rename macro.

* Bump version to 1.2.0-rc7

* Fix define on flatpak, add cwd behavior.

* Temporarily disable current working dir code.

* Add the cmake option for flatpak.

* Bump version to 1.2.0-rc8

* Update MacPorts. (#578)

* Update MacPorts.

* Try GitHub runner.

* Deselect universal, return to blaze.

* pull universal libiconv first

* Fix controller nav issues in config menu, bump version to 1.2.0-rc9

---------

Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com>
Co-authored-by: LittleCube <littlecubehax@gmail.com>
Co-authored-by: Dario <dariosamo@gmail.com>
This commit is contained in:
Wiseguy
2025-05-04 10:33:10 -04:00
committed by GitHub
parent 14f92c41ab
commit 983d7f43f8
30 changed files with 325 additions and 76 deletions
+58 -1
View File
@@ -36,7 +36,8 @@ namespace recompui {
Element root_element;
Element* autofocus_element = nullptr;
std::vector<Element*> loose_elements;
std::unordered_set<ResourceId> to_update;
std::unordered_set<ResourceId> to_update;
std::vector<std::tuple<Element*, ResourceId, std::string>> to_set_text;
bool captures_input = true;
bool captures_mouse = true;
Context(Rml::ElementDocument* document) : document(document), root_element(document) {}
@@ -67,6 +68,8 @@ enum class ContextErrorType {
AddResourceToWrongContext,
UpdateElementWithoutContext,
UpdateElementInWrongContext,
SetTextElementWithoutContext,
SetTextElementInWrongContext,
GetResourceWithoutOpen,
GetResourceFailed,
DestroyResourceWithoutOpen,
@@ -119,6 +122,12 @@ void context_error(recompui::ContextId id, ContextErrorType type) {
case ContextErrorType::UpdateElementInWrongContext:
error_message = "Attempted to update a UI element in a different UI context than the one that's open";
break;
case ContextErrorType::SetTextElementWithoutContext:
error_message = "Attempted to set the text of a UI element with no open UI context";
break;
case ContextErrorType::SetTextElementInWrongContext:
error_message = "Attempted to set the text of a UI element in a different UI context than the one that's open";
break;
case ContextErrorType::GetResourceWithoutOpen:
error_message = "Attempted to get a UI resource with no open UI context";
break;
@@ -407,6 +416,40 @@ void recompui::ContextId::process_updates() {
static_cast<Element*>(cur_resource->get())->handle_event(update_event);
}
std::vector<std::tuple<Element*, ResourceId, std::string>> to_set_text = std::move(opened_context->to_set_text);
// Delete the Rml elements that are pending deletion.
for (auto cur_text_update : to_set_text) {
Element* element_ptr = std::get<0>(cur_text_update);
ResourceId resource = std::get<1>(cur_text_update);
std::string& text = std::get<2>(cur_text_update);
// If the resource ID is valid, prefer that as we can quickly validate if the resource still exists.
if (resource != ResourceId::null()) {
resource_slotmap::key cur_key{ resource.slot_id };
std::unique_ptr<Style>* cur_resource = opened_context->resources.get(cur_key);
// Make sure the resource exists before setting its text, as it may have been deleted.
if (cur_resource == nullptr) {
continue;
}
// Perform the text update.
static_cast<Element*>(cur_resource->get())->base->SetInnerRML(text);
}
// Otherwise we use the element pointer, but we need to validate that it still exists before doing so.
else {
// Scan the current resources to find the target element.
for (const std::unique_ptr<Style>& cur_e : opened_context->resources) {
if (cur_e.get() == element_ptr) {
element_ptr->base->SetInnerRML(text);
// We can stop after finding the element.
break;
}
}
}
}
}
bool recompui::ContextId::captures_input() {
@@ -514,6 +557,20 @@ void recompui::ContextId::queue_element_update(ResourceId element) {
opened_context->to_update.emplace(element);
}
void recompui::ContextId::queue_set_text(Element* element, std::string&& text) {
// Ensure a context is currently opened by this thread.
if (opened_context_id == ContextId::null()) {
context_error(*this, ContextErrorType::SetTextElementWithoutContext);
}
// Check that the context that was specified is the same one that's currently open.
if (*this != opened_context_id) {
context_error(*this, ContextErrorType::SetTextElementInWrongContext);
}
opened_context->to_set_text.emplace_back(std::make_tuple(element, element->resource_id, std::move(text)));
}
recompui::Style* recompui::ContextId::create_style() {
return add_resource_impl(std::make_unique<Style>());
}