Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 02:17:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Insality 2025-04-19 19:49:51 +03:00
commit 4cb16de782
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.defignore
View File

@ -1,2 +1,2 @@
/dist /dist
/.deployer_cache /.deployer_cache

10
druid/extended/input.lua
View File

@ -182,7 +182,7 @@ function M:on_input(action_id, action)
if self.max_length then if self.max_length then
self.marked_value = utf8.sub(self.marked_value, 1, self.max_length) self.marked_value = utf8.sub(self.marked_value, 1, self.max_length)
end end
is_marked_text_changed = true is_marked_text_changed = self.marked_value ~= ""
end end
if action_id == const.ACTION_BACKSPACE and (action.pressed or action.repeated) then if action_id == const.ACTION_BACKSPACE and (action.pressed or action.repeated) then
@ -222,7 +222,7 @@ function M:on_input(action_id, action)
end end
if input_text or is_marked_text_changed then if input_text or is_marked_text_changed then
self:set_text(input_text) self:set_text(input_text or self.value)
if cursor_shift_indexes then if cursor_shift_indexes then
self:select_cursor(self.cursor_index + cursor_shift_indexes) self:select_cursor(self.cursor_index + cursor_shift_indexes)
@ -247,12 +247,6 @@ function M:on_focus_lost()
end end
---@private
function M:on_input_interrupt()
--self:unselect()
end
function M:get_text_selected() function M:get_text_selected()
if self.start_index == self.end_index then if self.start_index == self.end_index then
return self.value return self.value

2
example/druid.gui_script
View File

@ -175,7 +175,7 @@ local function setup_components(self)
return return
end end
local url_prefix = "https://github.com/Insality/druid/blob/develop/" local url_prefix = "https://github.com/Insality/druid/blob/master/"
sys.open_url(url_prefix .. code_url, { target = "_blank" }) sys.open_url(url_prefix .. code_url, { target = "_blank" })
end) end)
end end

29
example/examples/basic/input/basic_input.lua
View File

@ -2,10 +2,33 @@
---@field input druid.input ---@field input druid.input
local M = {} local M = {}
function M:init()
self.input = self.druid:new_input("input/root", "input/text")
self.input_2 = self.druid:new_input("input_2/root", "input_2/text") --[[@as druid.input]] local COLOR_SELECTED = vmath.vector3(1, 1, 1)
local COLOR_UNSELECTED = vmath.vector3(184/255, 189/255, 194/255)
---@param template string
---@param nodes table<hash, node>
function M:init(template, nodes)
self.druid = self:get_druid(template, nodes)
self.input = self.druid:new_input("input/root", "input/text")
self.input.on_input_select:subscribe(function()
gui.set_color(self.input.text.node, COLOR_SELECTED)
end)
self.input.on_input_unselect:subscribe(function(_, text)
print("User Enters Text: " .. text)
gui.set_color(self.input.text.node, COLOR_UNSELECTED)
end)
self.input_2 = self.druid:new_input("input_2/root", "input_2/text")
self.input_2:set_text("")
self.input_2.on_input_select:subscribe(function()
gui.set_color(self.input_2.text.node, COLOR_SELECTED)
end)
self.input_2.on_input_unselect:subscribe(function(_, text)
print("User Enters Text: " .. text)
gui.set_color(self.input_2.text.node, COLOR_UNSELECTED)
end)
-- you can set custom style for input and their components -- you can set custom style for input and their components
-- Check in the example, how long tap on bottom input will erase text -- Check in the example, how long tap on bottom input will erase text