mirror of
https://github.com/Insality/druid
synced 2025-09-27 10:02:19 +02:00
Replace event with event library
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
local component = require("druid.component")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
|
||||
---@class checkbox: druid.base_component
|
||||
---@field druid druid_instance
|
||||
|
@@ -1,4 +1,4 @@
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local component = require("druid.component")
|
||||
|
||||
-- Require checkbox component from checkbox example
|
||||
|
@@ -1,5 +1,5 @@
|
||||
local component = require("druid.component")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
|
||||
-- Require checkbox component from checkbox example
|
||||
local checkbox = require("example.examples.basic.checkbox.checkbox")
|
||||
|
@@ -1,7 +1,7 @@
|
||||
local component = require("druid.component")
|
||||
local rich_text = require("druid.custom.rich_text.rich_text")
|
||||
local helper = require("druid.helper")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
|
||||
---@class rich_text_tags_custom: druid.base_component
|
||||
---@field druid druid_instance
|
||||
|
@@ -1,4 +1,4 @@
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local timer = require("druid.extended.timer")
|
||||
|
||||
local component = require("druid.component")
|
||||
|
@@ -1,4 +1,4 @@
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local component = require("druid.component")
|
||||
local data_list = require("druid.extended.data_list")
|
||||
|
||||
@@ -26,7 +26,7 @@ function M:init(template, nodes)
|
||||
end
|
||||
self.data_list:set_data(data)
|
||||
|
||||
self.on_item_click = event()
|
||||
self.on_item_click = event.create()
|
||||
end
|
||||
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local component = require("druid.component")
|
||||
local data_list = require("druid.extended.data_list")
|
||||
|
||||
@@ -25,7 +25,7 @@ function M:init(template, nodes)
|
||||
end
|
||||
self.data_list:set_data(data)
|
||||
|
||||
self.on_item_click = event()
|
||||
self.on_item_click = event.create()
|
||||
end
|
||||
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local component = require("druid.component")
|
||||
local data_list = require("druid.extended.data_list")
|
||||
|
||||
@@ -30,7 +30,7 @@ function M:init(template, nodes)
|
||||
end
|
||||
self.data_list:set_data(data)
|
||||
|
||||
self.on_item_click = event()
|
||||
self.on_item_click = event.create()
|
||||
end
|
||||
|
||||
|
||||
|
@@ -1,13 +1,13 @@
|
||||
local const = require("druid.const")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local helper = require("druid.helper")
|
||||
local component = require("druid.component")
|
||||
|
||||
---@class on_screen_input: druid.base_component
|
||||
---@field druid druid_instance
|
||||
---@field on_action druid.event @()
|
||||
---@field on_movement druid.event @(x: number, y: number, dt: number) X/Y values are in range -1..1
|
||||
---@field on_movement_stop druid.event @()
|
||||
---@field on_action event @()
|
||||
---@field on_movement event @(x: number, y: number, dt: number) X/Y values are in range -1..1
|
||||
---@field on_movement_stop event @()
|
||||
local M = component.create("on_screen_input")
|
||||
|
||||
local STICK_DISTANCE = 80
|
||||
@@ -23,9 +23,9 @@ function M:init(template, nodes)
|
||||
self.stick_root = self:get_node("on_screen_stick/stick_root")
|
||||
self.stick_position = gui.get_position(self.stick_root)
|
||||
|
||||
self.on_action = event()
|
||||
self.on_movement = event()
|
||||
self.on_movement_stop = event()
|
||||
self.on_action = event.create()
|
||||
self.on_movement = event.create()
|
||||
self.on_movement_stop = event.create()
|
||||
|
||||
self.is_multitouch = helper.is_multitouch_supported()
|
||||
end
|
||||
|
@@ -1,7 +1,7 @@
|
||||
local panthera = require("panthera.panthera")
|
||||
local component = require("druid.component")
|
||||
local helper = require("druid.helper")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local lang_text = require("druid.extended.lang_text")
|
||||
local rich_text = require("druid.custom.rich_text.rich_text")
|
||||
|
||||
@@ -31,7 +31,7 @@ function M:init(template, nodes)
|
||||
})
|
||||
|
||||
self:setup_rich_text()
|
||||
self.on_update = event()
|
||||
self.on_update = event.create()
|
||||
end
|
||||
|
||||
|
||||
|
@@ -59,7 +59,15 @@ function M.get_examples()
|
||||
template = "example_memory_panel",
|
||||
root = "example_memory_panel/root",
|
||||
code_url = "example/examples/widgets/memory_panel/example_memory_panel.lua",
|
||||
component_class = require("example.examples.widgets.memory_panel.example_memory_panel"),
|
||||
widget_class = require("example.examples.widgets.memory_panel.example_memory_panel"),
|
||||
},
|
||||
{
|
||||
name_id = "ui_example_widget_fps_panel",
|
||||
information_text_id = "ui_example_widget_fps_panel_description",
|
||||
template = "example_fps_panel",
|
||||
root = "example_fps_panel/root",
|
||||
code_url = "example/examples/widgets/fps_panel/example_fps_panel.lua",
|
||||
widget_class = require("example.examples.widgets.fps_panel.example_fps_panel"),
|
||||
},
|
||||
}
|
||||
end
|
||||
|
104
example/examples/widgets/fps_panel/example_fps_panel.gui
Normal file
104
example/examples/widgets/fps_panel/example_fps_panel.gui
Normal file
@@ -0,0 +1,104 @@
|
||||
nodes {
|
||||
size {
|
||||
x: 200.0
|
||||
y: 100.0
|
||||
}
|
||||
type: TYPE_BOX
|
||||
id: "root"
|
||||
inherit_alpha: true
|
||||
size_mode: SIZE_MODE_AUTO
|
||||
visible: false
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEMPLATE
|
||||
id: "memory_panel"
|
||||
parent: "root"
|
||||
inherit_alpha: true
|
||||
template: "/druid/widget/fps_panel/fps_panel.gui"
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/root"
|
||||
parent: "memory_panel"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEMPLATE
|
||||
id: "memory_panel/mini_graph"
|
||||
parent: "memory_panel/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/root"
|
||||
parent: "memory_panel/mini_graph"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/header"
|
||||
parent: "memory_panel/mini_graph/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEXT
|
||||
id: "memory_panel/mini_graph/text_header"
|
||||
parent: "memory_panel/mini_graph/header"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/icon_drag"
|
||||
parent: "memory_panel/mini_graph/header"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/content"
|
||||
parent: "memory_panel/mini_graph/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/prefab_line"
|
||||
parent: "memory_panel/mini_graph/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/mini_graph/color_low"
|
||||
parent: "memory_panel/mini_graph/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/content"
|
||||
parent: "memory_panel/root"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEXT
|
||||
id: "memory_panel/text_min_fps"
|
||||
parent: "memory_panel/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_TEXT
|
||||
id: "memory_panel/text_fps"
|
||||
parent: "memory_panel/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/line_second_1"
|
||||
parent: "memory_panel/content"
|
||||
template_node_child: true
|
||||
}
|
||||
nodes {
|
||||
type: TYPE_BOX
|
||||
id: "memory_panel/line_second_2"
|
||||
parent: "memory_panel/content"
|
||||
template_node_child: true
|
||||
}
|
||||
material: "/builtins/materials/gui.material"
|
||||
adjust_reference: ADJUST_REFERENCE_PARENT
|
12
example/examples/widgets/fps_panel/example_fps_panel.lua
Normal file
12
example/examples/widgets/fps_panel/example_fps_panel.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
local fps_panel = require("druid.widget.fps_panel.fps_panel")
|
||||
|
||||
---@class widget.example_fps_panel: druid.widget
|
||||
local M = {}
|
||||
|
||||
|
||||
function M:init()
|
||||
self.fps_panel = self.druid:new_widget(fps_panel, "fps_panel")
|
||||
end
|
||||
|
||||
|
||||
return M
|
@@ -1,6 +1,6 @@
|
||||
local lang = require("lang.lang")
|
||||
local druid = require("druid.druid")
|
||||
local event = require("druid.event")
|
||||
local event = require("event.event")
|
||||
local component = require("druid.component")
|
||||
local lang_text = require("druid.extended.lang_text")
|
||||
local panthera = require("panthera.panthera")
|
||||
@@ -13,7 +13,7 @@ local window_animation_panthera = require("example.examples.windows.window_anima
|
||||
---@field druid druid_instance
|
||||
---@field lang_buttons table<string, druid.button>
|
||||
---@field grid druid.grid
|
||||
---@field on_language_change druid.event
|
||||
---@field on_language_change event
|
||||
local M = component.create("window_language")
|
||||
|
||||
---Color: #F0FBFF
|
||||
@@ -44,7 +44,7 @@ function M:init(template, nodes)
|
||||
|
||||
self:load_langs()
|
||||
|
||||
self.on_language_change = event()
|
||||
self.on_language_change = event.create()
|
||||
end
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user