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

fix: ui

Browse Source
This commit is contained in:
MihailRis 2024-06-16 14:18:58 +03:00
parent 51db6a1845
commit 41b5c5acfc
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/layouts/pages/content.xml.lua
View File

@ -22,19 +22,19 @@ end
function move_pack(id) function move_pack(id)
-- cancel pack addition -- cancel pack addition
if table.has(add_packs, id) then if table.has(add_packs, id) then
document["pack_"..id]:move_into(document.packs_add) document["pack_"..id]:moveInto(document.packs_add)
table.remove_value(add_packs, id) table.remove_value(add_packs, id)
-- cancel pack removal -- cancel pack removal
elseif table.has(rem_packs, id) then elseif table.has(rem_packs, id) then
document["pack_"..id]:move_into(document.packs_cur) document["pack_"..id]:moveInto(document.packs_cur)
table.remove_value(rem_packs, id) table.remove_value(rem_packs, id)
-- add pack -- add pack
elseif table.has(packs_installed, id) then elseif table.has(packs_installed, id) then
document["pack_"..id]:move_into(document.packs_add) document["pack_"..id]:moveInto(document.packs_add)
table.insert(rem_packs, id) table.insert(rem_packs, id)
-- remove pack -- remove pack
else else
document["pack_"..id]:move_into(document.packs_cur) document["pack_"..id]:moveInto(document.packs_cur)
table.insert(add_packs, id) table.insert(add_packs, id)
end end
refresh_changes() refresh_changes()
@ -120,12 +120,12 @@ end
function apply_movements(packs_cur, packs_add) function apply_movements(packs_cur, packs_add)
for i,id in ipairs(packs_installed) do for i,id in ipairs(packs_installed) do
if table.has(rem_packs, id) then if table.has(rem_packs, id) then
document["pack_"..id]:move_into(packs_add) document["pack_"..id]:moveInto(packs_add)
end end
end end
for i,id in ipairs(packs_available) do for i,id in ipairs(packs_available) do
if table.has(add_packs, id) then if table.has(add_packs, id) then
document["pack_"..id]:move_into(packs_cur) document["pack_"..id]:moveInto(packs_cur)
end end
end end
end end

5
src/logic/scripting/lua/libgui.cpp
View File

@ -86,7 +86,7 @@ static int l_container_add(lua::State* L) {
static int l_node_destruct(lua::State* L) { static int l_node_destruct(lua::State* L) {
auto docnode = getDocumentNode(L); auto docnode = getDocumentNode(L);
auto node = std::dynamic_pointer_cast<Container>(docnode.node); auto node = docnode.node;
engine->getGUI()->postRunnable([node]() { engine->getGUI()->postRunnable([node]() {
auto parent = node->getParent(); auto parent = node->getParent();
if (auto container = dynamic_cast<Container*>(parent)) { if (auto container = dynamic_cast<Container*>(parent)) {
@ -339,7 +339,8 @@ static int l_gui_getattr(lua::State* L) {
{"interactive", p_is_interactive}, {"interactive", p_is_interactive},
{"visible", p_is_visible}, {"visible", p_is_visible},
{"enabled", p_is_enabled}, {"enabled", p_is_enabled},
{"move_into", p_move_into}, {"move_into", p_move_into}, // deprecated
{"moveInto", p_move_into},
{"add", p_get_add}, {"add", p_get_add},
{"destruct", p_get_destruct}, {"destruct", p_get_destruct},
{"clear", p_get_clear}, {"clear", p_get_clear},