Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 18:37:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor dynamic grid add

Browse Source
This commit is contained in:
Insality 2020-09-27 22:33:26 +03:00
parent f6b7aba87f
commit ea0e7366d0
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
druid/base/dynamic_grid.lua
View File

@ -105,47 +105,34 @@ end
-- @tparam[opt] number index The node position. By default add as last node -- @tparam[opt] number index The node position. By default add as last node
-- @tparam[opt=false] bool is_shift_left If true, shift all nodes to the left, otherwise shift nodes to the right -- @tparam[opt=false] bool is_shift_left If true, shift all nodes to the left, otherwise shift nodes to the right
function DynamicGrid:add(node, index, is_shift_left) function DynamicGrid:add(node, index, is_shift_left)
local delta = is_shift_left and -1 or 1
-- By default add node at end
index = index or ((self.last_index or 0) + 1) index = index or ((self.last_index or 0) + 1)
print("if shift left", is_shift_left) -- If node exist at index place, shifting them
if self.nodes[index] then if self.nodes[index] then
if not is_shift_left then -- We need to iterate from index to start or end grid, depends of shift side
-- Move nodes to right local start_index = is_shift_left and self.first_index or self.last_index
for i = self.last_index, index, -1 do for i = start_index, index, -delta do
self.nodes[i + 1] = self.nodes[i] self.nodes[i + delta] = self.nodes[i]
end
else
-- Move nodes to left
for i = self.first_index, index do
self.nodes[i - 1] = self.nodes[i]
print("Move", i-1, i)
end
end end
end end
-- TODO: we must choose anchor node to add this node (next or previous) -- TODO: we must choose anchor node to add this node (next or previous)
local koef = is_shift_left and -1 or 1 self:_add_node(node, index, index - delta)
self:_add_node(node, index, index - koef)
print("Add at", index)
-- Now we can setup poses -- After shifting we should recalc node poses
if self.last_index then if self.last_index then
if not is_shift_left then -- We need to iterate from placed node to start or end grid, depends of shift side
for i = index + 1, self.last_index + 1 do local target_index = is_shift_left and self.first_index or self.last_index
for i = index + delta, target_index + delta, delta do
local move_node = self.nodes[i] local move_node = self.nodes[i]
move_node.pos = self:get_pos(i, move_node.node, i - 1) move_node.pos = self:get_pos(i, move_node.node, i - delta)
end
else
for i = index - 1, self.first_index - 1, -1 do
local move_node = self.nodes[i]
move_node.pos = self:get_pos(i, move_node.node, i + 1)
print("Recalct", i)
end
end end
end end
-- Sync grid data
self:_update() self:_update()
self.on_add_item:trigger(self:get_context(), node, index) self.on_add_item:trigger(self:get_context(), node, index)
@ -162,12 +149,22 @@ function DynamicGrid:remove(index, is_shift_left)
self.nodes[index] = nil self.nodes[index] = nil
-- Move other nodes closer to deleted index
if not is_shift_left then
for i = index, self.last_index do for i = index, self.last_index do
self.nodes[i] = self.nodes[i + 1] self.nodes[i] = self.nodes[i + 1]
if self.nodes[i] then if self.nodes[i] then
self.nodes[i].pos = self:get_pos(i, self.nodes[i].node, i - 1) self.nodes[i].pos = self:get_pos(i, self.nodes[i].node, i - 1)
end end
end end
else
for i = index, self.first_index, -1 do
self.nodes[i] = self.nodes[i - 1]
if self.nodes[i] then
self.nodes[i].pos = self:get_pos(i, self.nodes[i].node, i + 1)
end
end
end
self:_update() self:_update()