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

Remove scroll offset

Browse Source
This commit is contained in:
Insality 2020-09-28 01:36:14 +03:00
parent caeb3bbf2f
commit 40af3f6181
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
druid/base/scroll.lua
View File

@ -103,7 +103,6 @@ function Scroll:init(view_node, content_node)
self.view_node = self:get_node(view_node) self.view_node = self:get_node(view_node)
self.content_node = self:get_node(content_node) self.content_node = self:get_node(content_node)
self.scroll_offset = vmath.vector3(0)
self.position = gui.get_position(self.content_node) self.position = gui.get_position(self.content_node)
self.target_position = vmath.vector3(self.position) self.target_position = vmath.vector3(self.position)
@ -237,19 +236,6 @@ function Scroll:set_size(size)
end end
--- Set scroll content size by borders
-- It will change content gui node sizes
-- @function scroll:set_border
-- @tparam vector4 border The new scroll borders for content node
-- @treturn druid.Scroll Current scroll instance
function Scroll:set_scroll_offset(offset)
self.scroll_offset = offset
self:_update_size()
return self
end
--- Enable or disable scroll inert. --- Enable or disable scroll inert.
-- If disabled, scroll through points (if exist) -- If disabled, scroll through points (if exist)
-- If no points, just simple drag without inertion -- If no points, just simple drag without inertion
@ -552,10 +538,10 @@ function Scroll:_update_size()
self.available_pos = get_border_vector(view_border - content_border) self.available_pos = get_border_vector(view_border - content_border)
self.available_size = get_size_vector(self.available_pos) self.available_size = get_size_vector(self.available_pos)
self.available_pos.x = self.available_pos.x + self.scroll_offset.x self.available_pos.x = self.available_pos.x
self.available_pos.z = self.available_pos.z + self.scroll_offset.x self.available_pos.z = self.available_pos.z
self.available_pos.y = self.available_pos.y + self.scroll_offset.y self.available_pos.y = self.available_pos.y
self.available_pos.w = self.available_pos.w + self.scroll_offset.y self.available_pos.w = self.available_pos.w
self.drag.can_x = self.available_size.x > 0 and self._is_horizontal_scroll self.drag.can_x = self.available_size.x > 0 and self._is_horizontal_scroll
self.drag.can_y = self.available_size.y > 0 and self._is_vertical_scroll self.drag.can_y = self.available_size.y > 0 and self._is_vertical_scroll
@ -585,10 +571,10 @@ function Scroll:_update_size()
self.available_pos_extra = get_border_vector(view_border - content_border_extra) self.available_pos_extra = get_border_vector(view_border - content_border_extra)
self.available_size_extra = get_size_vector(self.available_pos_extra) self.available_size_extra = get_size_vector(self.available_pos_extra)
self.available_pos_extra.x = self.available_pos_extra.x + self.scroll_offset.x self.available_pos_extra.x = self.available_pos_extra.x
self.available_pos_extra.z = self.available_pos_extra.z + self.scroll_offset.x self.available_pos_extra.z = self.available_pos_extra.z
self.available_pos_extra.y = self.available_pos_extra.y + self.scroll_offset.y self.available_pos_extra.y = self.available_pos_extra.y
self.available_pos_extra.w = self.available_pos_extra.w + self.scroll_offset.y self.available_pos_extra.w = self.available_pos_extra.w
end end