mirror of
https://github.com/Insality/druid
synced 2025-09-27 18:12:21 +02:00
Compare commits
22 Commits
1.1.0
...
properties
Author | SHA1 | Date | |
---|---|---|---|
|
633bb8ed5c | ||
|
16a5d9936a | ||
|
350770ba9e | ||
|
97942965cd | ||
|
0cf5ba30db | ||
|
2e1f280944 | ||
|
fe955b6e64 | ||
|
2133492efe | ||
|
22c49540df | ||
|
8ddb6e4e60 | ||
|
b982bc8277 | ||
|
d939d017cb | ||
|
488e78c9d7 | ||
|
52659a96ee | ||
|
58f14d0a64 | ||
|
6572da3b14 | ||
|
d7c26358a0 | ||
|
f007a28ab7 | ||
|
d98c3c2ef1 | ||
|
c87f1331ed | ||
|
efc38672c9 | ||
|
df516a08c6 |
@@ -39,7 +39,7 @@ Open your `game.project` file and add the following lines to the dependencies fi
|
||||
**[Druid](https://github.com/Insality/druid/)**
|
||||
|
||||
```
|
||||
https://github.com/Insality/druid/archive/refs/tags/1.1.0.zip
|
||||
https://github.com/Insality/druid/archive/refs/tags/1.1.3.zip
|
||||
```
|
||||
|
||||
**[Defold Event](https://github.com/Insality/defold-event)**
|
||||
|
@@ -38,6 +38,7 @@ Create container component with druid: `container = druid:new_container(node, mo
|
||||
- [clear_draggable_corners](#clear_draggable_corners)
|
||||
- [fit_into_node](#fit_into_node)
|
||||
- [set_min_size](#set_min_size)
|
||||
- [set_max_size](#set_max_size)
|
||||
|
||||
## Fields
|
||||
|
||||
@@ -54,6 +55,8 @@ Create container component with druid: `container = druid:new_container(node, mo
|
||||
- [fit_size](#fit_size)
|
||||
- [min_size_x](#min_size_x)
|
||||
- [min_size_y](#min_size_y)
|
||||
- [max_size_x](#max_size_x)
|
||||
- [max_size_y](#max_size_y)
|
||||
- [on_size_changed](#on_size_changed)
|
||||
- [node_fill_x](#node_fill_x)
|
||||
- [node_fill_y](#node_fill_y)
|
||||
@@ -303,6 +306,21 @@ Set the minimum size of the container
|
||||
- **Returns:**
|
||||
- `self` *(druid.container)*: Current container instance
|
||||
|
||||
### set_max_size
|
||||
|
||||
---
|
||||
```lua
|
||||
container:set_max_size([max_size_x], [max_size_y])
|
||||
```
|
||||
|
||||
Set the maximum size of the container
|
||||
|
||||
- **Parameters:**
|
||||
- `[max_size_x]` *(number|nil)*: The maximum size x
|
||||
- `[max_size_y]` *(number|nil)*: The maximum size y
|
||||
|
||||
- **Returns:**
|
||||
- `self` *(druid.container)*: Current container instance
|
||||
|
||||
## Fields
|
||||
<a name="node"></a>
|
||||
@@ -344,6 +362,12 @@ Set the minimum size of the container
|
||||
<a name="min_size_y"></a>
|
||||
- **min_size_y** (_number_): The minimum size y
|
||||
|
||||
<a name="max_size_x"></a>
|
||||
- **max_size_x** (_number_): The maximum size x
|
||||
|
||||
<a name="max_size_y"></a>
|
||||
- **max_size_y** (_number_): The maximum size y
|
||||
|
||||
<a name="on_size_changed"></a>
|
||||
- **on_size_changed** (_event_): fun(self: druid.container, size: vector3) The event triggered when the size changes
|
||||
|
||||
|
@@ -177,6 +177,7 @@ container:refresh_origins()
|
||||
container:refresh_scale()
|
||||
container:remove_container_by_node([node])
|
||||
container:set_min_size([min_size_x], [min_size_y])
|
||||
container:set_max_size([max_size_x], [max_size_y])
|
||||
container:set_parent_container([parent_container])
|
||||
container:set_pivot(pivot)
|
||||
container:set_position(pos_x, pos_y)
|
||||
|
@@ -20,7 +20,7 @@ local M = component.create("blocker")
|
||||
---@param node node|string The node to use as a blocker
|
||||
function M:init(node)
|
||||
self.node = self:get_node(node)
|
||||
self._is_enabled = gui.is_enabled(self.node, true)
|
||||
self._is_enabled = true
|
||||
end
|
||||
|
||||
|
||||
|
@@ -67,8 +67,8 @@ function M:init(node_or_node_id, callback, custom_args, anim_node)
|
||||
self.start_scale = gui.get_scale(self.anim_node)
|
||||
self.start_pos = gui.get_position(self.anim_node)
|
||||
self.params = custom_args
|
||||
self.hover = self.druid:new_hover(node_or_node_id, self._on_button_hover)
|
||||
self.hover.on_mouse_hover:subscribe(self._on_button_mouse_hover)
|
||||
self.hover = self.druid:new_hover(node_or_node_id, self.button_hover)
|
||||
self.hover.on_mouse_hover:subscribe(self.button_mouse_hover)
|
||||
self.click_zone = nil
|
||||
self.is_repeated_started = false
|
||||
self.last_pressed_time = 0
|
||||
@@ -184,7 +184,7 @@ function M:on_input(action_id, action)
|
||||
if self._is_html5_mode then
|
||||
self._is_html5_listener_set = true
|
||||
html5.set_interaction_listener(function()
|
||||
self:_on_button_click()
|
||||
self:button_click()
|
||||
end)
|
||||
end
|
||||
return is_consume
|
||||
@@ -193,7 +193,7 @@ function M:on_input(action_id, action)
|
||||
-- While hold button, repeat rate pick from input.repeat_interval
|
||||
if action.repeated then
|
||||
if not self.on_repeated_click:is_empty() and self.can_action then
|
||||
self:_on_button_repeated_click()
|
||||
self:button_repeated_click()
|
||||
return is_consume
|
||||
end
|
||||
end
|
||||
@@ -211,7 +211,7 @@ function M:on_input(action_id, action)
|
||||
end
|
||||
|
||||
if press_time >= self.style.LONGTAP_TIME then
|
||||
self:_on_button_hold(press_time)
|
||||
self:button_hold(press_time)
|
||||
return is_consume
|
||||
end
|
||||
end
|
||||
@@ -326,18 +326,18 @@ end
|
||||
|
||||
|
||||
---@param hover_state boolean True if the hover state is active
|
||||
function M:_on_button_hover(hover_state)
|
||||
function M:button_hover(hover_state)
|
||||
self.style.on_hover(self, self.anim_node, hover_state)
|
||||
end
|
||||
|
||||
|
||||
---@param hover_state boolean True if the hover state is active
|
||||
function M:_on_button_mouse_hover(hover_state)
|
||||
function M:button_mouse_hover(hover_state)
|
||||
self.style.on_mouse_hover(self, self.anim_node, hover_state)
|
||||
end
|
||||
|
||||
|
||||
function M:_on_button_click()
|
||||
function M:button_click()
|
||||
if self._is_html5_mode then
|
||||
self._is_html5_listener_set = false
|
||||
html5.set_interaction_listener(nil)
|
||||
@@ -348,7 +348,7 @@ function M:_on_button_click()
|
||||
end
|
||||
|
||||
|
||||
function M:_on_button_repeated_click()
|
||||
function M:button_repeated_click()
|
||||
if not self.is_repeated_started then
|
||||
self.click_in_row = 0
|
||||
self.is_repeated_started = true
|
||||
@@ -360,7 +360,7 @@ function M:_on_button_repeated_click()
|
||||
end
|
||||
|
||||
|
||||
function M:_on_button_long_click()
|
||||
function M:button_long_click()
|
||||
self.click_in_row = 1
|
||||
local time = socket.gettime() - self.last_pressed_time
|
||||
self.on_long_click:trigger(self:get_context(), self.params, self, time)
|
||||
@@ -368,7 +368,7 @@ function M:_on_button_long_click()
|
||||
end
|
||||
|
||||
|
||||
function M:_on_button_double_click()
|
||||
function M:button_double_click()
|
||||
self.click_in_row = self.click_in_row + 1
|
||||
self.on_double_click:trigger(self:get_context(), self.params, self, self.click_in_row)
|
||||
self.style.on_click(self, self.anim_node)
|
||||
@@ -376,7 +376,7 @@ end
|
||||
|
||||
|
||||
---@param press_time number Amount of time the button was held
|
||||
function M:_on_button_hold(press_time)
|
||||
function M:button_hold(press_time)
|
||||
self.on_hold_callback:trigger(self:get_context(), self.params, self, press_time)
|
||||
end
|
||||
|
||||
@@ -413,14 +413,14 @@ function M:_on_button_release()
|
||||
if is_long_click then
|
||||
local is_hold_complete = (time - self.last_pressed_time) >= self.style.AUTOHOLD_TRIGGER
|
||||
if is_hold_complete then
|
||||
self:_on_button_long_click()
|
||||
self:button_long_click()
|
||||
else
|
||||
self.on_click_outside:trigger(self:get_context(), self.params, self)
|
||||
end
|
||||
elseif is_double_click then
|
||||
self:_on_button_double_click()
|
||||
self:button_double_click()
|
||||
else
|
||||
self:_on_button_click()
|
||||
self:button_click()
|
||||
end
|
||||
|
||||
self.last_released_time = time
|
||||
|
@@ -205,6 +205,59 @@ function M:scroll_to(point, is_instant)
|
||||
end
|
||||
|
||||
|
||||
function M:scroll_to_make_node_visible(node, is_instant)
|
||||
-- Can be any node not only directly at scroll content
|
||||
local screen_position = gui.get_screen_position(node)
|
||||
local local_position = gui.screen_to_local(self.content_node, screen_position)
|
||||
|
||||
-- Get the node borders in content node space
|
||||
local node_border = helper.get_border(node, local_position)
|
||||
|
||||
-- Calculate how much we need to scroll to make the node visible
|
||||
local scroll_position = vmath.vector3(self.position)
|
||||
local view_border = self.view_border
|
||||
|
||||
-- Convert content position to view position
|
||||
local node_in_view_x = node_border.x + scroll_position.x
|
||||
local node_in_view_y = node_border.y + scroll_position.y
|
||||
local node_in_view_z = node_border.z + scroll_position.x
|
||||
local node_in_view_w = node_border.w + scroll_position.y
|
||||
|
||||
local target_position = vmath.vector3(scroll_position)
|
||||
|
||||
-- Check if node is outside view horizontally
|
||||
if self._is_horizontal_scroll then
|
||||
-- If the node is too far to the right (left side not visible)
|
||||
if node_in_view_x < view_border.x then
|
||||
target_position.x = scroll_position.x + (view_border.x - node_in_view_x)
|
||||
end
|
||||
-- If the node is too far to the left (right side not visible)
|
||||
if node_in_view_z > view_border.z then
|
||||
target_position.x = scroll_position.x - (node_in_view_z - view_border.z)
|
||||
end
|
||||
end
|
||||
|
||||
-- Check if node is outside view vertically
|
||||
if self._is_vertical_scroll then
|
||||
-- If the node is too far up (bottom side not visible)
|
||||
if node_in_view_w < view_border.w then
|
||||
target_position.y = scroll_position.y + (view_border.w - node_in_view_w)
|
||||
end
|
||||
-- If the node is too far down (top side not visible)
|
||||
if node_in_view_y > view_border.y then
|
||||
target_position.y = scroll_position.y - (node_in_view_y - view_border.y)
|
||||
end
|
||||
end
|
||||
|
||||
-- If we need to scroll, do it
|
||||
if target_position.x ~= scroll_position.x or target_position.y ~= scroll_position.y then
|
||||
-- Convert to scroll_to expected format (content position, not scroll position)
|
||||
local scroll_to_position = vmath.vector3(-target_position.x, -target_position.y, 0)
|
||||
self:scroll_to(scroll_to_position, is_instant)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
---Scroll to item in scroll by point index.
|
||||
---@param index number Point index
|
||||
---@param skip_cb boolean|nil If true, skip the point callback
|
||||
|
@@ -8,9 +8,17 @@ local M = {}
|
||||
|
||||
|
||||
---Get color by string (hex or from palette)
|
||||
---@param color_id string Color id from palette or hex color
|
||||
---@param color_id string|vector4 Color id from palette or hex color
|
||||
---@return vector4
|
||||
function M.get_color(color_id)
|
||||
if type(color_id) == "vector4" then
|
||||
return color_id
|
||||
end
|
||||
|
||||
if PALETTE_DATA[color_id] then
|
||||
return PALETTE_DATA[color_id]
|
||||
end
|
||||
|
||||
-- Check is it hex: starts with "#" or contains only 3 or 6 hex symbols
|
||||
if type(color_id) == "string" then
|
||||
if string.sub(color_id, 1, 1) == "#" or string.match(color_id, "^[0-9a-fA-F]+$") then
|
||||
@@ -18,7 +26,7 @@ function M.get_color(color_id)
|
||||
end
|
||||
end
|
||||
|
||||
return PALETTE_DATA[color_id] or COLOR_WHITE
|
||||
return COLOR_WHITE
|
||||
end
|
||||
|
||||
|
||||
@@ -171,4 +179,16 @@ function M.rgb2hex(red, green, blue)
|
||||
end
|
||||
|
||||
|
||||
local DEFAULT_PALETTE_PATH = sys.get_config_string("druid.palette_path")
|
||||
if DEFAULT_PALETTE_PATH then
|
||||
local loaded_palette = sys.load_resource(DEFAULT_PALETTE_PATH)
|
||||
local data = loaded_palette and json.decode(loaded_palette)
|
||||
if not data then
|
||||
return
|
||||
end
|
||||
|
||||
M.add_palette(data)
|
||||
end
|
||||
|
||||
|
||||
return M
|
||||
|
@@ -20,20 +20,20 @@ local helper = require("druid.helper")
|
||||
---@field _uid number
|
||||
|
||||
---@class druid.component
|
||||
---@field druid druid.instance Druid instance to create inner components
|
||||
---@field init fun(self:druid.component, ...)|nil Called when component is created
|
||||
---@field update fun(self:druid.component, dt:number)|nil Called every frame
|
||||
---@field on_remove fun(self:druid.component)|nil Called when component is removed
|
||||
---@field on_input fun(self:druid.component, action_id:hash, action:table)|nil Called when input event is triggered
|
||||
---@field on_input_interrupt fun(self:druid.component, action_id:hash, action:table)|nil Called when input event is consumed before
|
||||
---@field on_message fun(self:druid.component, message_id:hash, message:table, sender:url)|nil Called when message is received
|
||||
---@field on_late_init fun(self:druid.component)|nil Called before update once time after GUI init
|
||||
---@field on_focus_lost fun(self:druid.component)|nil Called when app lost focus
|
||||
---@field on_focus_gained fun(self:druid.component)|nil Called when app gained focus
|
||||
---@field on_style_change fun(self:druid.component, style: table)|nil Called when style is changed
|
||||
---@field on_layout_change fun(self:druid.component)|nil Called when GUI layout is changed
|
||||
---@field on_window_resized fun(self:druid.component)|nil Called when window is resized
|
||||
---@field on_language_change fun(self:druid.component)|nil Called when language is changed
|
||||
---@field protected druid druid.instance Druid instance to create inner components
|
||||
---@field protected init fun(self:druid.component, ...)|nil Called when component is created
|
||||
---@field protected update fun(self:druid.component, dt:number)|nil Called every frame
|
||||
---@field protected on_remove fun(self:druid.component)|nil Called when component is removed
|
||||
---@field protected on_input fun(self:druid.component, action_id:hash, action:table)|nil Called when input event is triggered
|
||||
---@field protected on_input_interrupt fun(self:druid.component, action_id:hash, action:table)|nil Called when input event is consumed before
|
||||
---@field protected on_message fun(self:druid.component, message_id:hash, message:table, sender:url)|nil Called when message is received
|
||||
---@field protected on_late_init fun(self:druid.component)|nil Called before update once time after GUI init
|
||||
---@field protected on_focus_lost fun(self:druid.component)|nil Called when app lost focus
|
||||
---@field protected on_focus_gained fun(self:druid.component)|nil Called when app gained focus
|
||||
---@field protected on_style_change fun(self:druid.component, style: table)|nil Called when style is changed
|
||||
---@field protected on_layout_change fun(self:druid.component)|nil Called when GUI layout is changed
|
||||
---@field protected on_window_resized fun(self:druid.component)|nil Called when window is resized
|
||||
---@field protected on_language_change fun(self:druid.component)|nil Called when language is changed
|
||||
---@field private _component druid.component.component
|
||||
---@field private _meta druid.component.meta
|
||||
local M = {}
|
||||
@@ -117,12 +117,23 @@ function M:set_nodes(nodes)
|
||||
nodes = gui.clone_tree(nodes) --[[@as table<hash, node>]]
|
||||
end
|
||||
|
||||
-- When we use gui.clone_tree in inner template (template inside other template)
|
||||
-- this nodes have no id. We have table: hash(correct_id) : hash("") or hash("_nodeX"
|
||||
-- It's wrong and we use this hack to fix this
|
||||
if nodes then
|
||||
for id, node in pairs(nodes) do
|
||||
gui.set_id(node, id)
|
||||
end
|
||||
end
|
||||
|
||||
self._meta.nodes = nodes
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
---Return current component context
|
||||
---@protected
|
||||
---@return any context Usually it's self of script but can be any other Druid component
|
||||
function M:get_context()
|
||||
return self._meta.context
|
||||
@@ -138,6 +149,7 @@ end
|
||||
|
||||
|
||||
---Get Druid instance for inner component creation.
|
||||
---@protected
|
||||
---@param template string|nil
|
||||
---@param nodes table<hash, node>|node|string|nil The nodes table from gui.clone_tree or prefab node to use for clone or node id to clone
|
||||
---@return druid.instance
|
||||
@@ -166,6 +178,7 @@ end
|
||||
|
||||
|
||||
---Get parent component name
|
||||
---@protected
|
||||
---@return string|nil parent_name The parent component name if exist or nil
|
||||
function M:get_parent_name()
|
||||
local parent = self:get_parent_component()
|
||||
@@ -218,6 +231,7 @@ end
|
||||
|
||||
|
||||
---Get component UID, unique identifier created in component creation order.
|
||||
---@protected
|
||||
---@return number uid The component uid
|
||||
function M:get_uid()
|
||||
return self._component._uid
|
||||
@@ -300,6 +314,7 @@ end
|
||||
|
||||
|
||||
---Get current component nodes
|
||||
---@protected
|
||||
---@return table<hash, node>|nil
|
||||
function M:get_nodes()
|
||||
local nodes = self._meta.nodes
|
||||
@@ -342,6 +357,7 @@ end
|
||||
|
||||
|
||||
---Return all children components, recursive
|
||||
---@protected
|
||||
---@return table Array of childrens if the Druid component instance
|
||||
function M:get_childrens()
|
||||
local childrens = {}
|
||||
@@ -358,6 +374,7 @@ end
|
||||
|
||||
|
||||
---Сreate a new component class, which will inherit from the base Druid component.
|
||||
---@protected
|
||||
---@param name string|nil The name of the component
|
||||
---@param input_priority number|nil The input priority. The bigger number processed first. Default value: 10
|
||||
---@return druid.component
|
||||
|
@@ -73,10 +73,8 @@ M.REVERSE_PIVOTS = {
|
||||
M.LAYOUT_MODE = {
|
||||
STRETCH_X = "stretch_x",
|
||||
STRETCH_Y = "stretch_y",
|
||||
ZOOM_MIN = "zoom_min",
|
||||
ZOOM_MAX = "zoom_max",
|
||||
FIT = gui.ADJUST_FIT,
|
||||
STRETCH = gui.ADJUST_STRETCH,
|
||||
FIT = "fit",
|
||||
STRETCH = "stretch",
|
||||
}
|
||||
|
||||
M.CURRENT_SYSTEM_NAME = sys.get_sys_info().system_name
|
||||
|
@@ -181,6 +181,7 @@ function M.create(text, settings, style)
|
||||
shadow = settings.shadow,
|
||||
outline = settings.outline,
|
||||
font = gui.get_font(settings.text_prefab),
|
||||
split_to_characters = settings.split_to_characters,
|
||||
-- Image params
|
||||
---@type druid.rich_text.word.image
|
||||
image = nil,
|
||||
|
@@ -29,6 +29,7 @@ local function add_word(text, settings, words)
|
||||
end
|
||||
|
||||
words[#words + 1] = data
|
||||
return data
|
||||
end
|
||||
|
||||
|
||||
@@ -44,7 +45,16 @@ local function split_line(line, settings, words)
|
||||
else
|
||||
local wi = #words
|
||||
for word in trimmed_text:gmatch("%S+") do
|
||||
add_word(word .. " ", settings, words)
|
||||
if settings.split_to_characters then
|
||||
for i = 1, #word do
|
||||
local symbol = utf8.sub(word, i, i)
|
||||
local w = add_word(symbol, settings, words)
|
||||
w.nobr = true
|
||||
end
|
||||
add_word(" ", settings, words)
|
||||
else
|
||||
add_word(word .. " ", settings, words)
|
||||
end
|
||||
end
|
||||
local first = words[wi + 1]
|
||||
first.text = ws_start .. first.text
|
||||
|
@@ -2,7 +2,8 @@
|
||||
-- Author: Britzl
|
||||
-- Modified by: Insality
|
||||
|
||||
local color = require("druid.custom.rich_text.module.rt_color")
|
||||
--local color = require("druid.custom.rich_text.module.rt_color")
|
||||
local color = require("druid.color")
|
||||
|
||||
local M = {}
|
||||
local tags = {}
|
||||
@@ -43,20 +44,17 @@ end
|
||||
-- Format: <color={COLOR_NAME}>{Text}</color>
|
||||
-- Example: <color=FF0000>Rich Text</color>
|
||||
M.register("color", function(params, settings, style)
|
||||
params = style.COLORS[params] or params
|
||||
settings.color = color.parse(params)
|
||||
settings.color = color.get_color(params)
|
||||
end)
|
||||
|
||||
|
||||
M.register("shadow", function(params, settings, style)
|
||||
params = style.COLORS[params] or params
|
||||
settings.shadow = color.parse(params)
|
||||
settings.shadow = color.get_color(params)
|
||||
end)
|
||||
|
||||
|
||||
M.register("outline", function(params, settings, style)
|
||||
params = style.COLORS[params] or params
|
||||
settings.outline = color.parse(params)
|
||||
settings.outline = color.get_color(params)
|
||||
end)
|
||||
|
||||
|
||||
|
@@ -13,6 +13,7 @@ local rich_text = require("druid.custom.rich_text.module.rt")
|
||||
---@field image_pixel_grid_snap boolean
|
||||
---@field combine_words boolean
|
||||
---@field default_animation string
|
||||
---@field split_by_character boolean
|
||||
---@field text_prefab node
|
||||
---@field adjust_scale number
|
||||
---@field default_texture string
|
||||
@@ -50,7 +51,6 @@ local rich_text = require("druid.custom.rich_text.module.rt")
|
||||
---@field height number
|
||||
|
||||
---@class druid.rich_text.style
|
||||
---@field COLORS table<string, vector4>
|
||||
---@field ADJUST_STEPS number
|
||||
---@field ADJUST_SCALE_DELTA number
|
||||
|
||||
@@ -104,7 +104,6 @@ end
|
||||
---@param style druid.rich_text.style
|
||||
function M:on_style_change(style)
|
||||
self.style = {
|
||||
COLORS = style.COLORS or {},
|
||||
ADJUST_STEPS = style.ADJUST_STEPS or 20,
|
||||
ADJUST_SCALE_DELTA = style.ADJUST_SCALE_DELTA or 0.02,
|
||||
}
|
||||
@@ -194,6 +193,15 @@ function M:tagged(tag)
|
||||
end
|
||||
|
||||
|
||||
---Set if the rich text should split to characters, not words
|
||||
---@param value boolean
|
||||
---@return druid.rich_text self
|
||||
function M:set_split_to_characters(value)
|
||||
self._settings.split_to_characters = value
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
---Get all current created words, each word is a table that contains the information about the word
|
||||
---@return druid.rich_text.word[]
|
||||
function M:get_words()
|
||||
@@ -239,6 +247,7 @@ function M:_create_settings()
|
||||
outline = gui.get_outline(self.root),
|
||||
text_leading = gui.get_leading(self.root),
|
||||
is_multiline = gui.get_line_break(self.root),
|
||||
split_to_characters = false,
|
||||
|
||||
-- Image settings
|
||||
image_pixel_grid_snap = false, -- disabled now
|
||||
|
@@ -1,6 +1,6 @@
|
||||
local component = require("druid.component")
|
||||
local helper = require("druid.helper")
|
||||
local defer = require("event.defer")
|
||||
local queues = require("event.queues")
|
||||
|
||||
---@class druid.tiling_node: druid.component
|
||||
---@field animation table
|
||||
@@ -28,7 +28,7 @@ function M:init(node)
|
||||
print("The druid.script is not found, please add it nearby to the GUI collection", msg.url())
|
||||
end)
|
||||
|
||||
defer.push("druid.get_atlas_path", {
|
||||
queues.push("druid.get_atlas_path", {
|
||||
texture_name = gui.get_texture(self.node),
|
||||
sender = msg.url(),
|
||||
}, self.on_get_atlas_path, self)
|
||||
|
@@ -28,4 +28,7 @@ images {
|
||||
images {
|
||||
image: "/druid/images/icons/icon_arrow.png"
|
||||
}
|
||||
images {
|
||||
image: "/druid/images/icons/icon_refresh.png"
|
||||
}
|
||||
extrude_borders: 2
|
||||
|
@@ -114,6 +114,12 @@ local function wrap_widget(widget)
|
||||
end
|
||||
end
|
||||
|
||||
for key, value in pairs(widget) do
|
||||
if event.is_event(value) then
|
||||
wrapped_widget[key] = value
|
||||
end
|
||||
end
|
||||
|
||||
return wrapped_widget
|
||||
end
|
||||
|
||||
@@ -127,22 +133,21 @@ end
|
||||
---@generic T: druid.widget
|
||||
---@param widget_class T The class of the widget to return
|
||||
---@param gui_url url GUI url
|
||||
---@return T? widget The new created widget,
|
||||
function M.get_widget(widget_class, gui_url)
|
||||
---@param params any|nil Additional parameters to pass to the widget's init function
|
||||
---@return T widget The new created widget,
|
||||
function M.get_widget(widget_class, gui_url, params)
|
||||
gui_url = gui_url or msg.url()
|
||||
local registered_druids = REGISTERED_GUI_WIDGETS[gui_url.socket]
|
||||
if not registered_druids then
|
||||
return nil
|
||||
end
|
||||
assert(registered_druids, "Druid widget not registered for this game object")
|
||||
|
||||
for index = 1, #registered_druids do
|
||||
local druid = registered_druids[index]
|
||||
if druid.fragment == gui_url.fragment and druid.path == gui_url.path then
|
||||
return druid.new_widget:trigger(widget_class)
|
||||
return druid.new_widget:trigger(widget_class, nil, nil, params)
|
||||
end
|
||||
end
|
||||
|
||||
return nil
|
||||
error("Druid widget not found for this game object: " .. gui_url)
|
||||
end
|
||||
|
||||
|
||||
@@ -156,8 +161,8 @@ function M.register_druid_as_widget(druid)
|
||||
table.insert(REGISTERED_GUI_WIDGETS[gui_url.socket], {
|
||||
path = gui_url.path,
|
||||
fragment = gui_url.fragment,
|
||||
new_widget = event.create(function(widget_class)
|
||||
return wrap_widget(druid:new_widget(widget_class))
|
||||
new_widget = event.create(function(widget_class, template, nodes, params)
|
||||
return wrap_widget(druid:new_widget(widget_class, template, nodes, params))
|
||||
end),
|
||||
})
|
||||
end
|
||||
|
@@ -3,7 +3,7 @@
|
||||
-- This one is a required to make a unified "Shaders" pipeline in the GUI scripts
|
||||
-- This required to grab a texture data with `go.get` function
|
||||
|
||||
local defer = require("event.defer")
|
||||
local queues = require("event.queues")
|
||||
|
||||
---Usage: defer.push("druid.get_atlas_path", {
|
||||
--- texture_name = gui.get_texture(self.node),
|
||||
@@ -35,10 +35,10 @@ end
|
||||
|
||||
|
||||
function init(self)
|
||||
defer.subscribe(MESSAGE_GET_ATLAS_PATH, get_atlas_path, self)
|
||||
queues.subscribe(MESSAGE_GET_ATLAS_PATH, get_atlas_path, self)
|
||||
end
|
||||
|
||||
|
||||
function final(self)
|
||||
defer.unsubscribe(MESSAGE_GET_ATLAS_PATH, get_atlas_path, self)
|
||||
queues.unsubscribe(MESSAGE_GET_ATLAS_PATH, get_atlas_path, self)
|
||||
end
|
||||
|
33
druid/extended/container.lua
Normal file → Executable file
33
druid/extended/container.lua
Normal file → Executable file
@@ -31,6 +31,8 @@ local CORNER_PIVOTS = {
|
||||
---@field DRAGGABLE_CORNER_SIZE vector3 Size of box node for debug draggable corners
|
||||
---@field DRAGGABLE_CORNER_COLOR vector4 Color of debug draggable corners
|
||||
|
||||
---@alias druid.container.mode "stretch" | "fit" | "stretch_x" | "stretch_y"
|
||||
|
||||
---Druid component to manage the size and positions with other containers relations to create a adaptable layouts.
|
||||
---
|
||||
---### Setup
|
||||
@@ -54,10 +56,12 @@ local CORNER_PIVOTS = {
|
||||
---@field position vector3 The current position
|
||||
---@field pivot_offset vector3 The pivot offset
|
||||
---@field center_offset vector3 The center offset
|
||||
---@field mode string The layout mode
|
||||
---@field mode druid.container.mode The layout mode
|
||||
---@field fit_size vector3 The fit size
|
||||
---@field min_size_x number|nil The minimum size x
|
||||
---@field min_size_y number|nil The minimum size y
|
||||
---@field max_size_x number|nil The maximum size x
|
||||
---@field max_size_y number|nil The maximum size y
|
||||
---@field on_size_changed event fun(self: druid.container, size: vector3) The event triggered when the size changes
|
||||
---@field _parent_container druid.container The parent container
|
||||
---@field _containers table The containers
|
||||
@@ -75,6 +79,8 @@ function M:init(node, mode, callback)
|
||||
|
||||
self.min_size_x = 0
|
||||
self.min_size_y = 0
|
||||
self.max_size_x = nil
|
||||
self.max_size_y = nil
|
||||
self._containers = {}
|
||||
self._draggable_corners = {}
|
||||
self.node_offset = vmath.vector4(0)
|
||||
@@ -166,6 +172,12 @@ function M:set_size(width, height, anchor_pivot)
|
||||
if self.min_size_y then
|
||||
height = max(height, self.min_size_y)
|
||||
end
|
||||
if self.max_size_x then
|
||||
width = min(width, self.max_size_x)
|
||||
end
|
||||
if self.max_size_y then
|
||||
height = min(height, self.max_size_y)
|
||||
end
|
||||
|
||||
if (width and width ~= self.size.x) or (height and height ~= self.size.y) then
|
||||
self.center_offset.x = -width * self.pivot_offset.x
|
||||
@@ -522,6 +534,12 @@ function M:_on_corner_drag(x, y, corner_offset)
|
||||
if self.min_size_y and size.y + y < self.min_size_y then
|
||||
y = self.min_size_y - size.y
|
||||
end
|
||||
if self.max_size_x and size.x + x > self.max_size_x then
|
||||
x = self.max_size_x - size.x
|
||||
end
|
||||
if self.max_size_y and size.y + y > self.max_size_y then
|
||||
y = self.max_size_y - size.y
|
||||
end
|
||||
|
||||
if corner_offset.x < 0 then
|
||||
self.node_offset.x = self.node_offset.x - x
|
||||
@@ -570,4 +588,17 @@ function M:set_min_size(min_size_x, min_size_y)
|
||||
end
|
||||
|
||||
|
||||
---Set the maximum size of the container
|
||||
---@param max_size_x number|nil The maximum size x
|
||||
---@param max_size_y number|nil The maximum size y
|
||||
---@return druid.container self Current container instance
|
||||
function M:set_max_size(max_size_x, max_size_y)
|
||||
self.max_size_x = max_size_x or self.max_size_x
|
||||
self.max_size_y = max_size_y or self.max_size_y
|
||||
self:refresh()
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
return M
|
||||
|
@@ -267,10 +267,17 @@ function M:_refresh()
|
||||
local start_index = self.grid:get_index(start_pos)
|
||||
start_index = math.max(1, start_index)
|
||||
|
||||
local pivot = helper.get_pivot_offset(gui.get_pivot(self.scroll.view_node))
|
||||
local offset_x = self.scroll.view_size.x * (0.5 - pivot.x)
|
||||
local offset_y = self.scroll.view_size.y * (0.5 + pivot.y)
|
||||
local offset_x = self.scroll.view_size.x
|
||||
local offset_y = self.scroll.view_size.y
|
||||
local end_pos = vmath.vector3(start_pos.x + offset_x, start_pos.y - offset_y, 0)
|
||||
|
||||
local max_offset_x = (self.grid.in_row - 1) * self.grid.node_size.x
|
||||
end_pos.x = math.min(end_pos.x, start_pos.x + max_offset_x)
|
||||
|
||||
if #self._data <= self.grid.in_row then
|
||||
end_pos.y = start_pos.y
|
||||
end
|
||||
|
||||
local end_index = self.grid:get_index(end_pos)
|
||||
end_index = math.min(#self._data, end_index)
|
||||
|
||||
|
@@ -55,12 +55,13 @@ function M:init(node_or_node_id, layout_type)
|
||||
self.entities = {}
|
||||
self.size = gui.get_size(self.node)
|
||||
|
||||
-- Padding X is a Slice9 L Value
|
||||
-- Padding Y is a Slice9 T Value
|
||||
self.padding = gui.get_slice9(self.node)
|
||||
-- Margin X is a Slice9 R Value
|
||||
-- Margin Y is a Slice9 B Value
|
||||
self.margin = { x = self.padding.z, y = self.padding.w }
|
||||
-- Padding X is a Slice9 L Value
|
||||
-- Padding Y is a Slice9 T Value
|
||||
|
||||
self.padding.z = self.padding.x
|
||||
self.padding.w = self.padding.y
|
||||
|
||||
@@ -123,10 +124,10 @@ function M:set_margin(margin_x, margin_y)
|
||||
end
|
||||
|
||||
|
||||
---@param padding_x number|nil The padding x
|
||||
---@param padding_y number|nil The padding y
|
||||
---@param padding_z number|nil The padding z
|
||||
---@param padding_w number|nil The padding w
|
||||
---@param padding_x number|nil From Left
|
||||
---@param padding_y number|nil From Top
|
||||
---@param padding_z number|nil From Right
|
||||
---@param padding_w number|nil From Bottom
|
||||
---@return druid.layout self Current layout instance
|
||||
function M:set_padding(padding_x, padding_y, padding_z, padding_w)
|
||||
self.padding.x = padding_x or self.padding.x
|
||||
|
BIN
druid/images/icons/icon_refresh.png
Normal file
BIN
druid/images/icons/icon_refresh.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 593 B |
@@ -148,12 +148,4 @@ M["hotkey"] = {
|
||||
}
|
||||
|
||||
|
||||
M["rich_text"] = {
|
||||
COLORS = {
|
||||
white = "#FFFFFF",
|
||||
black = "#000000"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return M
|
||||
|
@@ -1,5 +1,5 @@
|
||||
---@class druid.widget: druid.component
|
||||
---@field druid druid.instance Ready to use druid instance
|
||||
---@field protected druid druid.instance Ready to use druid instance
|
||||
|
||||
---@class druid.logger
|
||||
---@field trace fun(message: string, context: any)
|
||||
|
@@ -681,7 +681,7 @@ end
|
||||
local container = require("druid.extended.container")
|
||||
---Create Container component
|
||||
---@param node string|node The node_id or gui.get_node(node_id).
|
||||
---@param mode string|nil Layout mode
|
||||
---@param mode druid.container.mode|nil Layout mode. Default Fit or Stretch depends from node adjust mode from GUI scene
|
||||
---@param callback fun(self: druid.container, size: vector3)|nil Callback on size changed
|
||||
---@return druid.container container The new container component
|
||||
function M:new_container(node, mode, callback)
|
||||
|
@@ -6,7 +6,6 @@ local color = require("druid.color")
|
||||
---@field text_name druid.text
|
||||
---@field button druid.button
|
||||
---@field text_button druid.text
|
||||
---@field druid druid.instance
|
||||
local M = {}
|
||||
|
||||
|
||||
@@ -51,6 +50,14 @@ function M:set_text_button(text)
|
||||
end
|
||||
|
||||
|
||||
---@param enabled boolean
|
||||
---@return druid.widget.property_button
|
||||
function M:set_enabled(enabled)
|
||||
self.button:set_enabled(enabled)
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
function M:set_color(color_value)
|
||||
color.set_color(self:get_node("button"), color_value)
|
||||
end
|
||||
|
@@ -73,4 +73,11 @@ function M:on_change(callback)
|
||||
end
|
||||
|
||||
|
||||
---Set the enabled state of the checkbox
|
||||
---@param enabled boolean
|
||||
function M:set_enabled(enabled)
|
||||
self.button:set_enabled(enabled)
|
||||
end
|
||||
|
||||
|
||||
return M
|
||||
|
@@ -101,6 +101,45 @@ nodes {
|
||||
inherit_alpha: true
|
||||
size_mode: SIZE_MODE_AUTO
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 152.0
|
||||
y: -4.0
|
||||
}
|
||||
color {
|
||||
x: 0.306
|
||||
y: 0.31
|
||||
z: 0.314
|
||||
}
|
||||
type: TYPE_BOX
|
||||
texture: "druid/icon_refresh"
|
||||
id: "icon_refresh"
|
||||
pivot: PIVOT_NE
|
||||
parent: "header"
|
||||
inherit_alpha: true
|
||||
size_mode: SIZE_MODE_AUTO
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 112.0
|
||||
y: -4.0
|
||||
}
|
||||
scale {
|
||||
x: -1.0
|
||||
}
|
||||
color {
|
||||
x: 0.306
|
||||
y: 0.31
|
||||
z: 0.314
|
||||
}
|
||||
type: TYPE_BOX
|
||||
texture: "druid/icon_arrow"
|
||||
id: "icon_back"
|
||||
pivot: PIVOT_NW
|
||||
parent: "header"
|
||||
inherit_alpha: true
|
||||
size_mode: SIZE_MODE_AUTO
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
y: -50.0
|
||||
|
@@ -1,3 +1,7 @@
|
||||
local event = require("event.event")
|
||||
|
||||
local color = require("druid.color")
|
||||
local helper = require("druid.helper")
|
||||
local property_checkbox = require("druid.widget.properties_panel.properties.property_checkbox")
|
||||
local property_slider = require("druid.widget.properties_panel.properties.property_slider")
|
||||
local property_button = require("druid.widget.properties_panel.properties.property_button")
|
||||
@@ -21,6 +25,8 @@ local property_vector3 = require("druid.widget.properties_panel.properties.prope
|
||||
---@field properties_constructors fun()[] List of properties functions to create a new widget. Used to not spawn non-visible widgets but keep the reference
|
||||
local M = {}
|
||||
|
||||
local COLOR_BUTTON = "#4E4F50"
|
||||
local COLOR_REFRESH_ACTIVE = "#8BD092"
|
||||
|
||||
function M:init()
|
||||
self.root = self:get_node("root")
|
||||
@@ -34,6 +40,9 @@ function M:init()
|
||||
|
||||
self.default_size = self.container:get_size()
|
||||
|
||||
-- To have ability to go back to previous scene, collections of all properties to rebuild
|
||||
self.scenes = {}
|
||||
|
||||
self.properties = {}
|
||||
self.properties_constructors = {}
|
||||
self.current_page = 1
|
||||
@@ -52,6 +61,15 @@ function M:init()
|
||||
self:set_hidden(not self._is_hidden)
|
||||
end):set_style(nil)
|
||||
|
||||
self.button_back = self.druid:new_button("icon_back", function()
|
||||
self:previous_scene()
|
||||
end)
|
||||
gui.set_enabled(self.button_back.node, false)
|
||||
|
||||
self.button_refresh = self.druid:new_button("icon_refresh", function()
|
||||
self:toggle_auto_refresh()
|
||||
end)
|
||||
|
||||
-- We not using as a part of properties, since it handled in a way to be paginable
|
||||
self.paginator = self.druid:new_widget(property_left_right_selector, "property_left_right_selector", "root")
|
||||
self.paginator:set_text("Page")
|
||||
@@ -80,6 +98,23 @@ function M:on_remove()
|
||||
end
|
||||
|
||||
|
||||
function M:toggle_auto_refresh()
|
||||
self._is_auto_refresh = not self._is_auto_refresh
|
||||
|
||||
if self._is_auto_refresh then
|
||||
self.is_dirty = true
|
||||
color.set_color(self.button_refresh.node, COLOR_REFRESH_ACTIVE)
|
||||
self._timer_refresh = timer.delay(1, true, function()
|
||||
self.is_dirty = true
|
||||
end)
|
||||
else
|
||||
color.set_color(self.button_refresh.node, COLOR_BUTTON)
|
||||
timer.cancel(self._timer_refresh)
|
||||
self._timer_refresh = nil
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function M:on_drag_widget(dx, dy)
|
||||
local position = self.container:get_position()
|
||||
self.container:set_position(position.x + dx, position.y + dy)
|
||||
@@ -112,9 +147,41 @@ function M:clear_created_properties()
|
||||
end
|
||||
|
||||
|
||||
function M:next_scene()
|
||||
local scene = {
|
||||
header = self.text_header:get_text(),
|
||||
current_page = self.current_page,
|
||||
}
|
||||
|
||||
helper.add_array(scene, self.properties_constructors)
|
||||
table.insert(self.scenes, scene)
|
||||
|
||||
self:clear()
|
||||
|
||||
self.is_dirty = true
|
||||
|
||||
gui.set_enabled(self.button_back.node, #self.scenes > 0)
|
||||
end
|
||||
|
||||
|
||||
function M:previous_scene()
|
||||
local scene = table.remove(self.scenes)
|
||||
self:clear()
|
||||
helper.add_array(self.properties_constructors, scene)
|
||||
|
||||
self.text_header:set_text(scene.header)
|
||||
self.current_page = scene.current_page
|
||||
|
||||
self.is_dirty = true
|
||||
|
||||
gui.set_enabled(self.button_back.node, #self.scenes > 0)
|
||||
end
|
||||
|
||||
|
||||
function M:clear()
|
||||
self:clear_created_properties()
|
||||
self.properties_constructors = {}
|
||||
self.current_page = 1
|
||||
end
|
||||
|
||||
|
||||
@@ -139,26 +206,28 @@ end
|
||||
|
||||
|
||||
function M:update(dt)
|
||||
if self.is_dirty then
|
||||
self.is_dirty = false
|
||||
if not self.is_dirty then
|
||||
return
|
||||
end
|
||||
|
||||
self:clear_created_properties()
|
||||
self.is_dirty = false
|
||||
|
||||
local properties_count = #self.properties_constructors
|
||||
self:clear_created_properties()
|
||||
|
||||
-- Render all current properties
|
||||
local start_index = (self.current_page - 1) * self.properties_per_page + 1
|
||||
local end_index = start_index + self.properties_per_page - 1
|
||||
end_index = math.min(end_index, properties_count)
|
||||
local properties_count = #self.properties_constructors
|
||||
|
||||
local is_paginator_visible = properties_count > self.properties_per_page
|
||||
gui.set_enabled(self.paginator.root, is_paginator_visible)
|
||||
self.paginator:set_number_type(1, math.ceil(properties_count / self.properties_per_page), true)
|
||||
self.paginator.text_value:set_text(self.current_page .. " / " .. math.ceil(properties_count / self.properties_per_page))
|
||||
-- Render all current properties
|
||||
local start_index = (self.current_page - 1) * self.properties_per_page + 1
|
||||
local end_index = start_index + self.properties_per_page - 1
|
||||
end_index = math.min(end_index, properties_count)
|
||||
|
||||
for index = start_index, end_index do
|
||||
self.properties_constructors[index]()
|
||||
end
|
||||
local is_paginator_visible = properties_count > self.properties_per_page
|
||||
gui.set_enabled(self.paginator.root, is_paginator_visible)
|
||||
self.paginator:set_number_type(1, math.ceil(properties_count / self.properties_per_page), true)
|
||||
self.paginator.text_value:set_text(self.current_page .. " / " .. math.ceil(properties_count / self.properties_per_page))
|
||||
|
||||
for index = start_index, end_index do
|
||||
self.properties_constructors[index]()
|
||||
end
|
||||
end
|
||||
|
||||
@@ -285,6 +354,12 @@ function M:remove(widget)
|
||||
end
|
||||
|
||||
|
||||
---Force to refresh properties next update
|
||||
function M:set_dirty()
|
||||
self.is_dirty = true
|
||||
end
|
||||
|
||||
|
||||
function M:set_hidden(is_hidden)
|
||||
self._is_hidden = is_hidden
|
||||
local hidden_size = gui.get_size(self:get_node("header"))
|
||||
@@ -293,6 +368,11 @@ function M:set_hidden(is_hidden)
|
||||
self.container:set_size(new_size.x, new_size.y, gui.PIVOT_N)
|
||||
|
||||
gui.set_enabled(self.content, not self._is_hidden)
|
||||
gui.set_enabled(self.button_refresh.node, not self._is_hidden)
|
||||
|
||||
if not self._is_hidden then
|
||||
self.is_dirty = true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -301,16 +381,183 @@ function M:is_hidden()
|
||||
end
|
||||
|
||||
|
||||
function M:load_previous_page()
|
||||
self.current_page = self.current_page - 1
|
||||
self.is_dirty = true
|
||||
end
|
||||
|
||||
|
||||
---@param properties_per_page number
|
||||
function M:set_properties_per_page(properties_per_page)
|
||||
self.properties_per_page = properties_per_page
|
||||
end
|
||||
|
||||
|
||||
---Set a page of current scene
|
||||
---@param page number
|
||||
function M:set_page(page)
|
||||
self.current_page = page
|
||||
self.is_dirty = true
|
||||
end
|
||||
|
||||
|
||||
---Set a text at left top corner of the properties panel
|
||||
---@param header string
|
||||
function M:set_header(header)
|
||||
self.text_header:set_text(header)
|
||||
end
|
||||
|
||||
|
||||
---@param data table
|
||||
function M:render_lua_table(data)
|
||||
local component_order = {}
|
||||
for component_id in pairs(data) do
|
||||
table.insert(component_order, component_id)
|
||||
end
|
||||
table.sort(component_order, function(a, b)
|
||||
local a_type = type(data[a])
|
||||
local b_type = type(data[b])
|
||||
if a_type ~= b_type then
|
||||
return a_type < b_type
|
||||
end
|
||||
if type(a) == "number" and type(b) == "number" then
|
||||
return a < b
|
||||
end
|
||||
return tostring(a) < tostring(b)
|
||||
end)
|
||||
|
||||
for i = 1, #component_order do
|
||||
local component_id = component_order[i]
|
||||
self:add_property_component(component_id, data)
|
||||
end
|
||||
|
||||
local metatable = getmetatable(data)
|
||||
if metatable and metatable.__index and type(metatable.__index) == "table" then
|
||||
local metatable_order = {}
|
||||
for key in pairs(metatable.__index) do
|
||||
table.insert(metatable_order, key)
|
||||
end
|
||||
table.sort(metatable_order)
|
||||
|
||||
for i = 1, #metatable_order do
|
||||
local component_id = metatable_order[i]
|
||||
local component = metatable.__index[component_id]
|
||||
self:add_property_component("M:" .. component_id, data)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
---@private
|
||||
---@param component_id string
|
||||
---@param data table
|
||||
function M:add_property_component(component_id, data)
|
||||
local component = data[component_id]
|
||||
local component_type = type(component)
|
||||
|
||||
if component_type == "table" then
|
||||
local is_event = event.is_event(component)
|
||||
if is_event then
|
||||
self:add_button(function(button)
|
||||
button:set_text_property(tostring(component_id))
|
||||
button:set_text_button("Call Event (" .. #component .. ")")
|
||||
button.button.on_click:subscribe(function()
|
||||
component:trigger()
|
||||
end)
|
||||
end)
|
||||
else
|
||||
self:add_button(function(button)
|
||||
local is_empty = next(component) == nil
|
||||
local is_array = component[1] ~= nil
|
||||
local name = "Inspect"
|
||||
if is_empty then
|
||||
name = "Inspect (Empty)"
|
||||
end
|
||||
if is_array then
|
||||
name = "Inspect (" .. #component .. ")"
|
||||
end
|
||||
|
||||
local button_name = component_id
|
||||
-- If it's a number or array, try to get the id/name/prefab_id from the component
|
||||
if type(component) == "table" and type(component_id) == "number" then
|
||||
local extracted_id = component.name or component.prefab_id or component.node_id or component.id
|
||||
if extracted_id then
|
||||
button_name = component_id .. ". " .. extracted_id
|
||||
end
|
||||
end
|
||||
|
||||
button:set_text_property(button_name)
|
||||
button:set_text_button(name)
|
||||
button.button.on_click:subscribe(function()
|
||||
self:next_scene()
|
||||
self:set_header(button_name)
|
||||
self:render_lua_table(component)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
if component_type == "string" then
|
||||
self:add_input(function(input)
|
||||
input:set_text_property(tostring(component_id))
|
||||
input:set_text_value(tostring(data[component_id]))
|
||||
input:on_change(function(_, value)
|
||||
data[component_id] = value
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
if component_type == "number" then
|
||||
self:add_input(function(input)
|
||||
input:set_text_property(tostring(component_id))
|
||||
input:set_text_value(tostring(helper.round(data[component_id], 3)))
|
||||
input:on_change(function(_, value)
|
||||
data[component_id] = tonumber(value)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
if component_type == "boolean" then
|
||||
self:add_checkbox(function(checkbox)
|
||||
checkbox:set_text_property(tostring(component_id))
|
||||
checkbox:set_value(data[component_id])
|
||||
checkbox:on_change(function(value)
|
||||
data[component_id] = value
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
if component_type == "userdata" then
|
||||
if types.is_vector3(component) then
|
||||
---@cast component vector3
|
||||
self:add_vector3(function(vector3)
|
||||
vector3:set_text_property(tostring(component_id))
|
||||
vector3:set_value(data[component_id].x, data[component_id].y, data[component_id].z)
|
||||
vector3.on_change:subscribe(function(value)
|
||||
data[component_id].x = value.x
|
||||
data[component_id].y = value.y
|
||||
data[component_id].z = value.z
|
||||
end)
|
||||
end)
|
||||
else
|
||||
self:add_text(function(text)
|
||||
text:set_text_property(tostring(component_id))
|
||||
text:set_text_value(tostring(data[component_id]))
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
if component_type == "function" then
|
||||
self:add_button(function(button)
|
||||
button:set_text_property(tostring(component_id))
|
||||
button:set_text_button("Call")
|
||||
button.button.on_click:subscribe(function()
|
||||
component(data)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
return M
|
||||
|
14
example/assets/default.display_profiles
Normal file
14
example/assets/default.display_profiles
Normal file
@@ -0,0 +1,14 @@
|
||||
profiles {
|
||||
name: "Landscape"
|
||||
qualifiers {
|
||||
width: 1920
|
||||
height: 1080
|
||||
}
|
||||
}
|
||||
profiles {
|
||||
name: "Portrait"
|
||||
qualifiers {
|
||||
width: 1080
|
||||
height: 1920
|
||||
}
|
||||
}
|
@@ -2863,6 +2863,49 @@ nodes {
|
||||
parent: "data_list_cache_with_component/button_component/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEMPLATE
|
||||
id: "data_list_matrix_basic"
|
||||
parent: "data_list"
|
||||
inherit_alpha: true
|
||||
template: "/example/examples/data_list/basic/data_list_matrix_basic.gui"
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "data_list_matrix_basic/root"
|
||||
parent: "data_list_matrix_basic"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "data_list_matrix_basic/view"
|
||||
parent: "data_list_matrix_basic/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "data_list_matrix_basic/content"
|
||||
parent: "data_list_matrix_basic/view"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "data_list_matrix_basic/prefab"
|
||||
parent: "data_list_matrix_basic/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "data_list_matrix_basic/panel"
|
||||
parent: "data_list_matrix_basic/prefab"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEXT
|
||||
id: "data_list_matrix_basic/text"
|
||||
parent: "data_list_matrix_basic/prefab"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
texture: "druid_example/empty"
|
||||
|
@@ -11,6 +11,12 @@ function M:init()
|
||||
self.drag = self.druid:new_drag("drag/root", self.on_drag)
|
||||
self.drag.on_drag_end:subscribe(self.on_drag_end)
|
||||
|
||||
self.druid:new_button("drag/root", function()
|
||||
self.counter = self.counter - 1
|
||||
gui.set_text(self.text_counter, self.counter)
|
||||
self:on_drop_to_zone()
|
||||
end)
|
||||
|
||||
-- Save start position for animation
|
||||
self.start_position = gui.get_position(self.drag.node)
|
||||
end
|
||||
|
@@ -1,4 +1,4 @@
|
||||
---@class widget.container_anchors: druid.widget
|
||||
---@class widget.container_resize: druid.widget
|
||||
local M = {}
|
||||
|
||||
|
||||
|
117
example/examples/data_list/basic/data_list_matrix_basic.gui
Normal file
117
example/examples/data_list/basic/data_list_matrix_basic.gui
Normal file
@@ -0,0 +1,117 @@
|
||||
fonts {
|
||||
name: "text_bold"
|
||||
font: "/example/assets/fonts/text_bold.font"
|
||||
}
|
||||
textures {
|
||||
name: "druid_example"
|
||||
texture: "/example/assets/druid_example.atlas"
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
texture: "druid_example/empty"
|
||||
id: "root"
|
||||
inherit_alpha: true
|
||||
size_mode: SIZE_MODE_AUTO
|
||||
visible: false
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
y: 350.0
|
||||
}
|
||||
size {
|
||||
x: 400.0
|
||||
y: 700.0
|
||||
}
|
||||
color {
|
||||
x: 0.173
|
||||
y: 0.184
|
||||
z: 0.204
|
||||
}
|
||||
type: TYPE_BOX
|
||||
texture: "druid_example/pixel"
|
||||
id: "view"
|
||||
pivot: PIVOT_N
|
||||
parent: "root"
|
||||
inherit_alpha: true
|
||||
clipping_mode: CLIPPING_MODE_STENCIL
|
||||
}
|
||||
nodes {
|
||||
size {
|
||||
x: 400.0
|
||||
y: 700.0
|
||||
}
|
||||
type: TYPE_BOX
|
||||
texture: "druid_example/empty"
|
||||
id: "content"
|
||||
pivot: PIVOT_N
|
||||
parent: "view"
|
||||
inherit_alpha: true
|
||||
visible: false
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
y: -350.0
|
||||
}
|
||||
size {
|
||||
x: 100.0
|
||||
y: 100.0
|
||||
}
|
||||
type: TYPE_BOX
|
||||
id: "prefab"
|
||||
parent: "content"
|
||||
inherit_alpha: true
|
||||
visible: false
|
||||
}
|
||||
nodes {
|
||||
size {
|
||||
x: 90.0
|
||||
y: 90.0
|
||||
}
|
||||
color {
|
||||
x: 0.631
|
||||
y: 0.843
|
||||
z: 0.961
|
||||
}
|
||||
type: TYPE_BOX
|
||||
texture: "druid_example/ui_circle_32"
|
||||
id: "panel"
|
||||
parent: "prefab"
|
||||
inherit_alpha: true
|
||||
slice9 {
|
||||
x: 16.0
|
||||
y: 16.0
|
||||
z: 16.0
|
||||
w: 16.0
|
||||
}
|
||||
}
|
||||
nodes {
|
||||
size {
|
||||
x: 50.0
|
||||
y: 50.0
|
||||
}
|
||||
color {
|
||||
x: 0.31
|
||||
y: 0.318
|
||||
z: 0.322
|
||||
}
|
||||
type: TYPE_TEXT
|
||||
text: "1"
|
||||
font: "text_bold"
|
||||
id: "text"
|
||||
outline {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
}
|
||||
shadow {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
}
|
||||
parent: "prefab"
|
||||
inherit_alpha: true
|
||||
outline_alpha: 0.0
|
||||
shadow_alpha: 0.0
|
||||
}
|
||||
material: "/builtins/materials/gui.material"
|
||||
adjust_reference: ADJUST_REFERENCE_PARENT
|
95
example/examples/data_list/basic/data_list_matrix_basic.lua
Normal file
95
example/examples/data_list/basic/data_list_matrix_basic.lua
Normal file
@@ -0,0 +1,95 @@
|
||||
local event = require("event.event")
|
||||
|
||||
---@class examples.data_list_matrix_basic: druid.widget
|
||||
---@field prefab node
|
||||
---@field scroll druid.scroll
|
||||
---@field grid druid.grid
|
||||
---@field data_list druid.data_list
|
||||
---@field on_item_click event
|
||||
local M = {}
|
||||
|
||||
|
||||
function M:init()
|
||||
self.prefab = self:get_node("prefab")
|
||||
gui.set_enabled(self.prefab, false)
|
||||
|
||||
self.scroll = self.druid:new_scroll("view", "content")
|
||||
self.grid = self.druid:new_grid("content", self.prefab, 4)
|
||||
self.data_list = self.druid:new_data_list(self.scroll, self.grid, self.create_item_callback) --[[@as druid.data_list]]
|
||||
|
||||
local data = {}
|
||||
for index = 1, 1000 do
|
||||
table.insert(data, {})
|
||||
end
|
||||
self.data_list:set_data(data)
|
||||
|
||||
self.on_item_click = event.create()
|
||||
end
|
||||
|
||||
|
||||
---@param item_data table
|
||||
---@param index number
|
||||
---@return node, druid.component
|
||||
function M:create_item_callback(item_data, index)
|
||||
local nodes = gui.clone_tree(self.prefab)
|
||||
|
||||
local root = nodes[self:get_template() .. "/prefab"]
|
||||
local text = nodes[self:get_template() .. "/text"]
|
||||
gui.set_enabled(root, true)
|
||||
gui.set_text(text, tostring(index))
|
||||
|
||||
local button = self.druid:new_button(root, self.on_button_click, index)
|
||||
return root, button
|
||||
end
|
||||
|
||||
|
||||
function M:on_button_click(index)
|
||||
self.on_item_click:trigger(index)
|
||||
end
|
||||
|
||||
|
||||
---@param output_list output_list
|
||||
function M:on_example_created(output_list)
|
||||
self.on_item_click:subscribe(function(index)
|
||||
output_list:add_log_text("Item clicked: " .. index)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
---@param properties_panel properties_panel
|
||||
function M:properties_control(properties_panel)
|
||||
local view_node = self.scroll.view_node
|
||||
local is_stencil = gui.get_clipping_mode(view_node) == gui.CLIPPING_MODE_STENCIL
|
||||
|
||||
properties_panel:add_checkbox("ui_clipping", is_stencil, function(value)
|
||||
gui.set_clipping_mode(view_node, value and gui.CLIPPING_MODE_STENCIL or gui.CLIPPING_MODE_NONE)
|
||||
end)
|
||||
|
||||
properties_panel:add_slider("ui_scroll", 0, function(value)
|
||||
self.scroll:scroll_to_percent(vmath.vector3(0, 1 - value, 0), true)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
---@return string
|
||||
function M:get_debug_info()
|
||||
local data_list = self.data_list
|
||||
|
||||
local data = data_list:get_data()
|
||||
local info = ""
|
||||
info = info .. "Data length: " .. #data .. "\n"
|
||||
info = info .. "First Visual Index: " .. data_list.top_index .. "\n"
|
||||
info = info .. "Last Visual Index: " .. data_list.last_index .. "\n"
|
||||
|
||||
local s = self.scroll
|
||||
info = info .. "\n"
|
||||
info = info .. "View Size Y: " .. gui.get(s.view_node, "size.y") .. "\n"
|
||||
info = info .. "Content Size Y: " .. gui.get(s.content_node, "size.y") .. "\n"
|
||||
info = info .. "Content position Y: " .. math.ceil(s.position.y) .. "\n"
|
||||
info = info .. "Content Range Y: " .. s.available_pos.y .. " - " .. s.available_pos.w .. "\n"
|
||||
|
||||
return info
|
||||
end
|
||||
|
||||
|
||||
return M
|
@@ -21,6 +21,15 @@ function M.get_examples()
|
||||
widget_class = require("example.examples.data_list.basic.data_list_horizontal_basic"),
|
||||
},
|
||||
|
||||
{
|
||||
name_id = "ui_example_data_list_matrix_basic",
|
||||
information_text_id = "ui_example_data_list_matrix_basic_description",
|
||||
template = "data_list_matrix_basic",
|
||||
root = "data_list_matrix_basic/root",
|
||||
code_url = "example/examples/data_list/basic/data_list_matrix_basic.lua",
|
||||
widget_class = require("example.examples.data_list.basic.data_list_matrix_basic"),
|
||||
},
|
||||
|
||||
{
|
||||
name_id = "ui_example_data_list_add_remove_clear",
|
||||
information_text_id = "ui_example_data_list_add_remove_clear_description",
|
||||
|
@@ -147,6 +147,9 @@
|
||||
"ui_example_data_list_horizontal_basic": "Data List Horizontal Basic",
|
||||
"ui_example_data_list_horizontal_basic_description": "How to make a horizontal data list",
|
||||
|
||||
"ui_example_data_list_matrix_basic": "Data List Matrix Basic",
|
||||
"ui_example_data_list_matrix_basic_description": "How to make a matrix data list",
|
||||
|
||||
"ui_example_data_list_add_remove_clear": "Data List Add Remove Clear",
|
||||
"ui_example_data_list_add_remove_clear_description": "How the add, remove and clear functions work in the data list",
|
||||
|
||||
|
@@ -14,7 +14,7 @@ update_frequency = 60
|
||||
|
||||
[project]
|
||||
title = Druid
|
||||
version = 1.1.0
|
||||
version = 1.1.3
|
||||
publisher = Insality
|
||||
developer = Maksim Tuprikov
|
||||
custom_resources = /example/locales
|
||||
@@ -58,7 +58,7 @@ cssfile = /builtins/manifests/web/dark_theme.css
|
||||
show_console_banner = 0
|
||||
|
||||
[native_extension]
|
||||
app_manifest =
|
||||
app_manifest =
|
||||
|
||||
[graphics]
|
||||
texture_profiles = /builtins/graphics/default.texture_profiles
|
||||
|
30
test/tests/test_container.lua
Normal file → Executable file
30
test/tests/test_container.lua
Normal file → Executable file
@@ -41,6 +41,8 @@ return function()
|
||||
assert(container.mode == const.LAYOUT_MODE.FIT)
|
||||
assert(container.min_size_x == 0)
|
||||
assert(container.min_size_y == 0)
|
||||
assert(container.max_size_x == nil)
|
||||
assert(container.max_size_y == nil)
|
||||
assert(container._containers ~= nil)
|
||||
assert(#container._containers == 0)
|
||||
|
||||
@@ -137,6 +139,34 @@ return function()
|
||||
gui.delete_node(container_node)
|
||||
end)
|
||||
|
||||
it("Should set max size", function()
|
||||
local container_node = gui.new_box_node(vmath.vector3(50, 50, 0), vmath.vector3(100, 100, 0))
|
||||
local container = druid:new_container(container_node)
|
||||
|
||||
assert(container.max_size_x == nil)
|
||||
assert(container.max_size_y == nil)
|
||||
|
||||
container:set_max_size(150, 200)
|
||||
|
||||
assert(container.max_size_x == 150)
|
||||
assert(container.max_size_y == 200)
|
||||
|
||||
-- Should respect max size when setting larger size
|
||||
container:set_size(300, 300)
|
||||
local size = container:get_size()
|
||||
assert(size.x == 150)
|
||||
assert(size.y == 200)
|
||||
|
||||
-- Should allow smaller size
|
||||
container:set_size(100, 100)
|
||||
size = container:get_size()
|
||||
assert(size.x == 100)
|
||||
assert(size.y == 100)
|
||||
|
||||
druid:remove(container)
|
||||
gui.delete_node(container_node)
|
||||
end)
|
||||
|
||||
it("Should fire on_size_changed event", function()
|
||||
local container_node = gui.new_box_node(vmath.vector3(50, 50, 0), vmath.vector3(100, 100, 0))
|
||||
local container = druid:new_container(container_node)
|
||||
|
@@ -81,7 +81,7 @@ return function()
|
||||
local rich_text = druid:new_rich_text(text_node)
|
||||
|
||||
-- Test color tag with named color
|
||||
local words = rich_text:set_text("<color=red>Colored Text</color>")
|
||||
local words = rich_text:set_text("<color=#FF0000>Colored Text</color>")
|
||||
|
||||
assert(#words > 0)
|
||||
-- Word should have a tags field with color tag
|
||||
@@ -104,7 +104,7 @@ return function()
|
||||
local rich_text = druid:new_rich_text(text_node)
|
||||
|
||||
-- Test shadow tag with named color
|
||||
local words = rich_text:set_text("<shadow=black>Shadowed Text</shadow>")
|
||||
local words = rich_text:set_text("<shadow=#000000>Shadowed Text</shadow>")
|
||||
|
||||
assert(#words > 0)
|
||||
assert(words[1].shadow ~= nil)
|
||||
@@ -129,7 +129,7 @@ return function()
|
||||
local rich_text = druid:new_rich_text(text_node)
|
||||
|
||||
-- Test outline tag with named color
|
||||
local words = rich_text:set_text("<outline=black>Outlined Text</outline>")
|
||||
local words = rich_text:set_text("<outline=#000000>Outlined Text</outline>")
|
||||
|
||||
assert(#words > 0)
|
||||
assert(words[1].outline ~= nil)
|
||||
@@ -228,7 +228,7 @@ return function()
|
||||
local rich_text = druid:new_rich_text(text_node)
|
||||
|
||||
-- Test combined tags
|
||||
local words = rich_text:set_text("<color=red><size=2>Big Red Text</size></color>")
|
||||
local words = rich_text:set_text("<color=#FF0000><size=2>Big Red Text</size></color>")
|
||||
|
||||
assert(#words > 0)
|
||||
assert(words[1].tags.color)
|
||||
@@ -236,7 +236,7 @@ return function()
|
||||
assert(words[1].relative_scale == 2)
|
||||
|
||||
-- Test nested tags
|
||||
words = rich_text:set_text("<color=red>Red <size=2>Big Red</size> Red</color>")
|
||||
words = rich_text:set_text("<color=#FF0000>Red <size=2>Big Red</size> Red</color>")
|
||||
|
||||
assert(#words >= 3)
|
||||
-- All words should have color tag
|
||||
|
@@ -703,6 +703,12 @@ Please support me if you like this project! It will help me keep engaged to upda
|
||||
[](https://github.com/sponsors/insality) [](https://ko-fi.com/insality) [](https://www.buymeacoffee.com/insality)
|
||||
|
||||
|
||||
### Druid 1.1.X
|
||||
#### Druid 1.1.1
|
||||
- [#309] Added max_size_x and max_size_y to container (by [astrochili](https://github.com/astrochili))
|
||||
|
||||
- {Place for the community changelogs}
|
||||
#### Druid 1.1.2
|
||||
- [#310] Add data list matrix example (Grid 4 in row)
|
||||
- [Data List] Fix for data list element amounts issue
|
||||
|
||||
#### Druid 1.1.3
|
||||
- Fix for node_id of cloned nodes with `gui.clone_tree`
|
||||
|
Reference in New Issue
Block a user