mirror of
https://github.com/Insality/druid
synced 2025-06-27 18:37:45 +02:00
Merge branch 'master' into tests
This commit is contained in:
commit
a87f775ac7
@ -560,12 +560,12 @@ end
|
|||||||
|
|
||||||
function Scroll._set_scroll_position(self, position)
|
function Scroll._set_scroll_position(self, position)
|
||||||
local available_extra = self.available_pos_extra
|
local available_extra = self.available_pos_extra
|
||||||
local position_x = helper.clamp(position.x, available_extra.x, available_extra.z)
|
position.x = helper.clamp(position.x, available_extra.x, available_extra.z)
|
||||||
local position_y = helper.clamp(position.y, available_extra.w, available_extra.y)
|
position.y = helper.clamp(position.y, available_extra.w, available_extra.y)
|
||||||
|
|
||||||
if self.position.x ~= position_x or self.position.y ~= position_y then
|
if self.position.x ~= position.x or self.position.y ~= position.y then
|
||||||
self.position.x = position_x
|
self.position.x = position.x
|
||||||
self.position.y = position_y
|
self.position.y = position.y
|
||||||
gui.set_position(self.content_node, self.position)
|
gui.set_position(self.content_node, self.position)
|
||||||
|
|
||||||
self.on_scroll:trigger(self:get_context(), self.position)
|
self.on_scroll:trigger(self:get_context(), self.position)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user