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

Add grid node anchor correct for calculate borders

Browse Source
This commit is contained in:
Insality 2020-09-16 00:47:24 +03:00
parent 7a6e8bbef3
commit f027d4ac96
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
druid/base/grid.lua
View File

@ -43,7 +43,10 @@ function M.init(self, parent, element, in_row)
self.anchor = vmath.vector3(0.5 + pivot.x, 0.5 - pivot.y, 0) self.anchor = vmath.vector3(0.5 + pivot.x, 0.5 - pivot.y, 0)
self.in_row = in_row or 1 self.in_row = in_row or 1
self.node_size = gui.get_size(self:get_node(element)) local node = self:get_node(element)
self.node_size = gui.get_size(node)
self.node_pivot = const.PIVOTS[gui.get_pivot(node)]
self.border = vmath.vector4(0) self.border = vmath.vector4(0)
self.border_offset = vmath.vector3(0) self.border_offset = vmath.vector3(0)
@ -58,11 +61,12 @@ end
local function _update_border(self, pos, border) local function _update_border(self, pos, border)
local size = self.node_size local size = self.node_size
local pivot = self.node_pivot
local left = pos.x - size.x/2 + self.border_offset.x local left = pos.x - size.x/2 - (size.x * pivot.x) + self.border_offset.x
local right = pos.x + size.x/2 + self.border_offset.x local right = pos.x + size.x/2 - (size.x * pivot.x) + self.border_offset.x
local top = pos.y + size.y/2 + self.border_offset.y local top = pos.y + size.y/2 - (size.y * pivot.y) + self.border_offset.y
local bottom = pos.y - size.y/2 + self.border_offset.y local bottom = pos.y - size.y/2 - (size.y * pivot.y)+ self.border_offset.y
border.x = math.min(border.x, left) border.x = math.min(border.x, left)
border.y = math.max(border.y, top) border.y = math.max(border.y, top)

2
example/gui/main/main.gui
View File

@ -10676,7 +10676,7 @@ nodes {
nodes { nodes {
position { position {
x: 0.0 x: 0.0
y: 3.0 y: 4.0
z: 0.0 z: 0.0
w: 1.0 w: 1.0
} }

4
example/page/infinity_page.lua
View File

@ -17,7 +17,7 @@ end
local function setup_infinity_list(self) local function setup_infinity_list(self)
local data = {} local data = {}
for i = 1, 2500 do for i = 1, 250 do
table.insert(data, i) table.insert(data, i)
end end
@ -27,7 +27,7 @@ local function setup_infinity_list(self)
end) end)
-- scroll to some index -- scroll to some index
local pos = self.infinity_grid:get_pos(950) local pos = self.infinity_grid:get_pos(100)
self.infinity_scroll:scroll_to(pos, true) self.infinity_scroll:scroll_to(pos, true)
end end