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

Small optimization && refactoring

Browse Source
This commit is contained in:
Insality
2023-07-15 15:56:06 +03:00
parent 337090e74c
commit 556e1a9bae
11 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
druid/base/back_handler.lua
View File

@@ -60,7 +60,7 @@ end
-- @tparam table action on_input action
-- @local
function BackHandler.on_input(self, action_id, action)
if not action[const.RELEASED] then
if not action.released then
return false
end

5
druid/base/button.lua
View File

@@ -340,10 +340,7 @@ function Button.on_input(self, action_id, action)
local is_pick = true
local is_key_trigger = (action_id == self.key_trigger)
if not is_key_trigger then
is_pick = gui.pick_node(self.node, action.x, action.y)
if self.click_zone then
is_pick = is_pick and gui.pick_node(self.click_zone, action.x, action.y)
end
is_pick = helper.pick_node(self.node, action.x, action.y, self.click_zone)
end
if not is_pick then

13
druid/base/drag.lua
View File

@@ -185,7 +185,7 @@ function Drag.init(self, node, on_drag_callback)
self.is_touch = false
self.is_drag = false
self.touch_start_pos = vmath.vector3(0)
self._is_disabled = false
self._is_enabled = true
self.can_x = true
self.can_y = true
@@ -233,14 +233,11 @@ function Drag.on_input(self, action_id, action)
return false
end
if not gui.is_enabled(self.node, true) or self._is_disabled then
if not self._is_enabled or not gui.is_enabled(self.node, true) then
return false
end
local is_pick = gui.pick_node(self.node, action.x, action.y)
if self.click_zone then
is_pick = is_pick and gui.pick_node(self.click_zone, action.x, action.y)
end
local is_pick = helper.pick_node(self.node, action.x, action.y, self.click_zone)
if not is_pick and not self.is_drag then
end_touch(self)
return false
@@ -318,7 +315,7 @@ end
-- @tparam Drag self @{Drag}
-- @tparam bool is_enabled
function Drag.set_enabled(self, is_enabled)
self._is_disabled = not is_enabled
self._is_enabled = is_enabled
end
@@ -326,7 +323,7 @@ end
-- @tparam Drag self @{Drag}
-- @treturn bool
function Drag.is_enabled(self)
return not self._is_disabled
return self._is_enabled
end

6
druid/base/hover.lua
View File

@@ -64,11 +64,7 @@ function Hover.on_input(self, action_id, action)
return false
end
local is_pick = gui.pick_node(self.node, action.x, action.y)
if self.click_zone then
is_pick = is_pick and gui.pick_node(self.click_zone, action.x, action.y)
end
local is_pick = helper.pick_node(self.node, action.x, action.y, self.click_zone)
local hover_function = action_id and self.set_hover or self.set_mouse_hover
if not is_pick then