voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 14:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix uinode.parent property

Browse source
This commit is contained in:
MihailRis 2026-06-05 23:19:21 +03:00
parent b1311fd03c
commit 902c885fe0
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/logic/scripting/lua/libs/libgui.cpp
View file

@ -420,15 +420,19 @@ static int p_get_data(UINode* node, lua::State* L) {
return 0; return 0;
} }
static const std::string& request_node_id(const DocumentNode& docnode) { static const std::string& request_node_id(UiDocument& document, UINode& node) {
std::string id = docnode.node->getId(); const std::string& id = node.getId();
if (id.empty()) { if (id.empty()) {
id = "#" + std::to_string( node.setId( "#" + std::to_string(
reinterpret_cast<std::ptrdiff_t>(docnode.node.get())); reinterpret_cast<std::ptrdiff_t>(&node)));
document.pushIndices(node.shared_from_this());
return node.getId();
} }
docnode.node->setId(std::move(id)); return id;
docnode.document->pushIndices(docnode.node); }
return docnode.node->getId();
static const std::string& request_node_id(const DocumentNode& docnode) {
return request_node_id(*docnode.document, *docnode.node);
} }
/// @brief Push UI-document node object to stack /// @brief Push UI-document node object to stack
@ -443,15 +447,14 @@ static int push_document_node(lua::State* L, const std::string& id) {
static int p_get_parent(UINode* node, lua::State* L) { static int p_get_parent(UINode* node, lua::State* L) {
auto parent = node->getParent(); auto parent = node->getParent();
if (!parent) { if (parent == nullptr) {
return 0; return 0;
} }
auto docname = lua::require_string(L, 1); auto docname = lua::require_string(L, 1);
auto element = lua::require_string(L, 2); auto element = lua::require_string(L, 2);
auto docnode = get_document_node_impl(L, docname, element); auto docnode = get_document_node_impl(L, docname, element);
const auto& id = request_node_id(docnode); const auto& id = request_node_id(*docnode.document, *parent);
return push_document_node(L, id); return push_document_node(L, id);
} }