PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix ui elements overriding

Browse Source
This commit is contained in:
MihailRis 2025-12-01 22:24:01 +03:00 committed by ShiftyX1
parent 5ae34c2dc2
commit d7f3bf9c7c
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/UiDocument.cpp
View File

@ -45,7 +45,7 @@ std::shared_ptr<gui::UINode> UiDocument::get(const std::string& id) const {
if (found == map.end()) {
return nullptr;
}
return found->second;
return found->second.lock();
}
const uidocscript& UiDocument::getScript() const {

2
src/frontend/UiDocument.hpp
View File

@ -19,7 +19,7 @@ struct uidocscript {
bool onclose : 1;
};
using UINodesMap = std::unordered_map<std::string, std::shared_ptr<gui::UINode>>;
using UINodesMap = std::unordered_map<std::string, std::weak_ptr<gui::UINode>>;
class UiDocument {
std::string id;

7
src/graphics/ui/elements/UINode.cpp
View File

@ -385,11 +385,14 @@ bool UINode::isSubnodeOf(const UINode* node) {
void UINode::getIndices(
const std::shared_ptr<UINode>& node,
std::unordered_map<std::string, std::shared_ptr<UINode>>& map
std::unordered_map<std::string, std::weak_ptr<UINode>>& map
) {
const std::string& id = node->getId();
if (!id.empty()) {
map[id] = node;
const auto& found = map.find(id);
if (found == map.end() || found->second.expired()) {
map[id] = node;
}
}
auto container = std::dynamic_pointer_cast<gui::Container>(node);
if (container) {

2
src/graphics/ui/elements/UINode.hpp
View File

@ -289,7 +289,7 @@ namespace gui {
/// @brief collect all nodes having id
static void getIndices(
const std::shared_ptr<UINode>& node,
std::unordered_map<std::string, std::shared_ptr<UINode>>& map
std::unordered_map<std::string, std::weak_ptr<UINode>>& map
);
static std::shared_ptr<UINode> find(