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

Update drag/slider scene node koefs, add layout max gui upscale

Browse Source
This commit is contained in:
Insality
2022-10-15 16:11:12 +03:00
parent 9cd1769c37
commit 4de50591f8
6 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
druid/base/drag.lua
View File

@@ -63,6 +63,7 @@ local function start_touch(self, touch)
self.x = touch.x
self.y = touch.y
self._scene_scale = helper.get_scene_scale(self.node)
self.on_touch_start:trigger(self:get_context())
end
@@ -155,11 +156,11 @@ end
-- or create your own style
-- @table style
-- @tfield[opt=10] number DRAG_DEADZONE Distance in pixels to start dragging
-- @tfield[opt=false] boolean IS_USE_SCREEN_KOEF If screen aspect ration affects on drag values
-- @tfield[opt=false] boolean NO_USE_SCREEN_KOEF If screen aspect ration affects on drag values
function Drag.on_style_change(self, style)
self.style = {}
self.style.DRAG_DEADZONE = style.DRAG_DEADZONE or 10
self.style.IS_USE_SCREEN_KOEF = style.IS_USE_SCREEN_KOEF or false
self.style.NO_USE_SCREEN_KOEF = style.NO_USE_SCREEN_KOEF or false
end
@@ -183,6 +184,8 @@ function Drag.init(self, node, on_drag_callback)
self.can_x = true
self.can_y = true
self._scene_scale = helper.get_scene_scale(self.node)
self.click_zone = nil
self.on_touch_start = Event()
self.on_touch_end = Event()
@@ -208,6 +211,7 @@ function Drag.on_window_resized(self)
local x_koef, y_koef = helper.get_screen_aspect_koef()
self._x_koef = x_koef
self._y_koef = y_koef
self._scene_scale = helper.get_scene_scale(self.node)
end
@@ -231,7 +235,6 @@ function Drag.on_input(self, action_id, action)
if self.click_zone then
is_pick = is_pick and gui.pick_node(self.click_zone, action.x, action.y)
end
if not is_pick and not self.is_drag then
end_touch(self)
return false
@@ -281,15 +284,15 @@ function Drag.on_input(self, action_id, action)
if self.is_drag then
local x_koef, y_koef = self._x_koef, self._y_koef
if not self.style.IS_USE_SCREEN_KOEF then
if self.style.NO_USE_SCREEN_KOEF then
x_koef, y_koef = 1, 1
end
self.on_drag:trigger(self:get_context(),
self.dx * x_koef,
self.dy * y_koef,
(self.x - self.touch_start_pos.x) * x_koef,
(self.y - self.touch_start_pos.y) * y_koef)
self.dx * x_koef / self._scene_scale.x,
self.dy * y_koef / self._scene_scale.y,
(self.x - self.touch_start_pos.x) * x_koef / self._scene_scale.x,
(self.y - self.touch_start_pos.y) * y_koef / self._scene_scale.y)
end
return self.is_drag