From 40af3f6181be3012efd0f997865e2d03ef1789bb Mon Sep 17 00:00:00 2001
From: Insality <insality@gmail.com>
Date: Mon, 28 Sep 2020 01:36:14 +0300
Subject: [PATCH] Remove scroll offset

---
 druid/base/scroll.lua | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/druid/base/scroll.lua b/druid/base/scroll.lua
index e898f0c..36c8159 100644
--- a/druid/base/scroll.lua
+++ b/druid/base/scroll.lua
@@ -103,7 +103,6 @@ function Scroll:init(view_node, content_node)
 
 	self.view_node = self:get_node(view_node)
 	self.content_node = self:get_node(content_node)
-	self.scroll_offset = vmath.vector3(0)
 
 	self.position = gui.get_position(self.content_node)
 	self.target_position = vmath.vector3(self.position)
@@ -237,19 +236,6 @@ function Scroll:set_size(size)
 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.
 -- If disabled, scroll through points (if exist)
 -- 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_size = get_size_vector(self.available_pos)
-	self.available_pos.x = self.available_pos.x + self.scroll_offset.x
-	self.available_pos.z = self.available_pos.z + self.scroll_offset.x
-	self.available_pos.y = self.available_pos.y + self.scroll_offset.y
-	self.available_pos.w = self.available_pos.w + self.scroll_offset.y
+	self.available_pos.x = self.available_pos.x
+	self.available_pos.z = self.available_pos.z
+	self.available_pos.y = self.available_pos.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_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_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.z = self.available_pos_extra.z + self.scroll_offset.x
-	self.available_pos_extra.y = self.available_pos_extra.y + self.scroll_offset.y
-	self.available_pos_extra.w = self.available_pos_extra.w + self.scroll_offset.y
+	self.available_pos_extra.x = self.available_pos_extra.x
+	self.available_pos_extra.z = self.available_pos_extra.z
+	self.available_pos_extra.y = self.available_pos_extra.y
+	self.available_pos_extra.w = self.available_pos_extra.w
 end