From b4ce073c4aad22a1c344352f62231d0f2661d727 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 16 Feb 2025 17:13:04 +0000 Subject: [PATCH] Update config, LuaLS definitions, bundle and changelog --- config.lua | 250 ++++++++++++++++++++++----------------------- release/basalt.lua | 27 ++--- 2 files changed, 139 insertions(+), 138 deletions(-) diff --git a/config.lua b/config.lua index af4e5e5..04c4031 100644 --- a/config.lua +++ b/config.lua @@ -1,152 +1,152 @@ return { ["files"] = { - ["src/main.lua"] = { - ["path"] = "main.lua", - ["name"] = "main", - }, - ["src/LuaLS.lua"] = { - ["path"] = "LuaLS.lua", - ["name"] = "LuaLS", - }, - ["src/elements/Program.lua"] = { - ["path"] = "elements/Program.lua", - ["name"] = "Program", - }, - ["src/elements/BaseFrame.lua"] = { - ["path"] = "elements/BaseFrame.lua", - ["name"] = "BaseFrame", - }, - ["src/libraries/colorHex.lua"] = { - ["path"] = "libraries/colorHex.lua", - ["name"] = "colorHex", - }, - ["src/plugins/debug.lua"] = { - ["path"] = "plugins/debug.lua", - ["name"] = "debug", - }, - ["src/plugins/state.lua"] = { - ["path"] = "plugins/state.lua", - ["name"] = "state", - }, - ["src/elements/Flexbox.lua"] = { - ["path"] = "elements/Flexbox.lua", - ["name"] = "Flexbox", - }, - ["src/render.lua"] = { - ["path"] = "render.lua", - ["name"] = "render", - }, - ["src/elements/Slider.lua"] = { - ["path"] = "elements/Slider.lua", - ["name"] = "Slider", - }, - ["src/elements/ProgressBar.lua"] = { - ["path"] = "elements/ProgressBar.lua", - ["name"] = "ProgressBar", - }, - ["src/elements/Dropdown.lua"] = { - ["path"] = "elements/Dropdown.lua", - ["name"] = "Dropdown", - }, - ["src/init.lua"] = { - ["path"] = "init.lua", - ["name"] = "init", - }, - ["src/errorManager.lua"] = { - ["path"] = "errorManager.lua", - ["name"] = "errorManager", - }, - ["src/elements/Checkbox.lua"] = { - ["path"] = "elements/Checkbox.lua", - ["name"] = "Checkbox", - }, - ["src/plugins/xml.lua"] = { - ["path"] = "plugins/xml.lua", - ["name"] = "xml", - }, - ["src/elements/Button.lua"] = { - ["path"] = "elements/Button.lua", - ["name"] = "Button", - }, - ["src/elements/Input.lua"] = { - ["path"] = "elements/Input.lua", - ["name"] = "Input", - }, - ["src/propertySystem.lua"] = { - ["path"] = "propertySystem.lua", - ["name"] = "propertySystem", - }, - ["src/elements/List.lua"] = { - ["path"] = "elements/List.lua", - ["name"] = "List", - }, - ["src/log.lua"] = { - ["path"] = "log.lua", - ["name"] = "log", + ["src/libraries/expect.lua"] = { + ["name"] = "expect", + ["path"] = "libraries/expect.lua", }, ["src/elements/Tree.lua"] = { - ["path"] = "elements/Tree.lua", ["name"] = "Tree", - }, - ["src/plugins/pluginTemplate.lua"] = { - ["path"] = "plugins/pluginTemplate.lua", - ["name"] = "pluginTemplate", - }, - ["src/libraries/utils.lua"] = { - ["path"] = "libraries/utils.lua", - ["name"] = "utils", + ["path"] = "elements/Tree.lua", }, ["src/elementManager.lua"] = { - ["path"] = "elementManager.lua", ["name"] = "elementManager", + ["path"] = "elementManager.lua", }, - ["src/elements/Container.lua"] = { - ["path"] = "elements/Container.lua", - ["name"] = "Container", - }, - ["src/plugins/animation.lua"] = { - ["path"] = "plugins/animation.lua", - ["name"] = "animation", - }, - ["src/plugins/theme.lua"] = { - ["path"] = "plugins/theme.lua", - ["name"] = "theme", - }, - ["src/elements/Label.lua"] = { - ["path"] = "elements/Label.lua", - ["name"] = "Label", - }, - ["src/plugins/benchmark.lua"] = { - ["path"] = "plugins/benchmark.lua", - ["name"] = "benchmark", - }, - ["src/elements/Menu.lua"] = { - ["path"] = "elements/Menu.lua", - ["name"] = "Menu", - }, - ["src/libraries/expect.lua"] = { - ["path"] = "libraries/expect.lua", - ["name"] = "expect", + ["src/plugins/state.lua"] = { + ["name"] = "state", + ["path"] = "plugins/state.lua", }, ["src/elements/Frame.lua"] = { - ["path"] = "elements/Frame.lua", ["name"] = "Frame", + ["path"] = "elements/Frame.lua", + }, + ["src/plugins/theme.lua"] = { + ["name"] = "theme", + ["path"] = "plugins/theme.lua", }, ["src/elements/Table.lua"] = { - ["path"] = "elements/Table.lua", ["name"] = "Table", + ["path"] = "elements/Table.lua", + }, + ["src/elements/Slider.lua"] = { + ["name"] = "Slider", + ["path"] = "elements/Slider.lua", + }, + ["src/plugins/debug.lua"] = { + ["name"] = "debug", + ["path"] = "plugins/debug.lua", + }, + ["src/elements/List.lua"] = { + ["name"] = "List", + ["path"] = "elements/List.lua", + }, + ["src/plugins/pluginTemplate.lua"] = { + ["name"] = "pluginTemplate", + ["path"] = "plugins/pluginTemplate.lua", + }, + ["src/elements/Button.lua"] = { + ["name"] = "Button", + ["path"] = "elements/Button.lua", + }, + ["src/elements/Input.lua"] = { + ["name"] = "Input", + ["path"] = "elements/Input.lua", + }, + ["src/elements/Label.lua"] = { + ["name"] = "Label", + ["path"] = "elements/Label.lua", }, ["src/elements/VisualElement.lua"] = { - ["path"] = "elements/VisualElement.lua", ["name"] = "VisualElement", + ["path"] = "elements/VisualElement.lua", + }, + ["src/elements/Program.lua"] = { + ["name"] = "Program", + ["path"] = "elements/Program.lua", + }, + ["src/elements/Menu.lua"] = { + ["name"] = "Menu", + ["path"] = "elements/Menu.lua", + }, + ["src/plugins/animation.lua"] = { + ["name"] = "animation", + ["path"] = "plugins/animation.lua", + }, + ["src/elements/Container.lua"] = { + ["name"] = "Container", + ["path"] = "elements/Container.lua", + }, + ["src/LuaLS.lua"] = { + ["name"] = "LuaLS", + ["path"] = "LuaLS.lua", + }, + ["src/libraries/utils.lua"] = { + ["name"] = "utils", + ["path"] = "libraries/utils.lua", + }, + ["src/log.lua"] = { + ["name"] = "log", + ["path"] = "log.lua", + }, + ["src/main.lua"] = { + ["name"] = "main", + ["path"] = "main.lua", + }, + ["src/render.lua"] = { + ["name"] = "render", + ["path"] = "render.lua", + }, + ["src/elements/Dropdown.lua"] = { + ["name"] = "Dropdown", + ["path"] = "elements/Dropdown.lua", + }, + ["src/errorManager.lua"] = { + ["name"] = "errorManager", + ["path"] = "errorManager.lua", + }, + ["src/elements/Flexbox.lua"] = { + ["name"] = "Flexbox", + ["path"] = "elements/Flexbox.lua", + }, + ["src/init.lua"] = { + ["name"] = "init", + ["path"] = "init.lua", + }, + ["src/elements/BaseFrame.lua"] = { + ["name"] = "BaseFrame", + ["path"] = "elements/BaseFrame.lua", + }, + ["src/propertySystem.lua"] = { + ["name"] = "propertySystem", + ["path"] = "propertySystem.lua", + }, + ["src/libraries/colorHex.lua"] = { + ["name"] = "colorHex", + ["path"] = "libraries/colorHex.lua", + }, + ["src/plugins/benchmark.lua"] = { + ["name"] = "benchmark", + ["path"] = "plugins/benchmark.lua", + }, + ["src/plugins/xml.lua"] = { + ["name"] = "xml", + ["path"] = "plugins/xml.lua", + }, + ["src/elements/ProgressBar.lua"] = { + ["name"] = "ProgressBar", + ["path"] = "elements/ProgressBar.lua", }, ["src/plugins/reactive.lua"] = { - ["path"] = "plugins/reactive.lua", ["name"] = "reactive", + ["path"] = "plugins/reactive.lua", }, ["src/elements/BaseElement.lua"] = { - ["path"] = "elements/BaseElement.lua", ["name"] = "BaseElement", + ["path"] = "elements/BaseElement.lua", + }, + ["src/elements/Checkbox.lua"] = { + ["name"] = "Checkbox", + ["path"] = "elements/Checkbox.lua", }, }, } \ No newline at end of file diff --git a/release/basalt.lua b/release/basalt.lua index 2482cae..01b38d8 100644 --- a/release/basalt.lua +++ b/release/basalt.lua @@ -1053,10 +1053,10 @@ function _c:mouse_click(dc,_d,ad) if ab.mouse_click(self,dc,_d,ad)then local bd=bc(self,"mouse_click",dc,_d,ad) local cd,dd=cc(self,true,"mouse_click",table.unpack(bd)) -if(cd)then self.set("focusedChild",dd)return true end;self.set("focusedChild",nil)end end +if(cd)then self.set("focusedChild",dd)return true end;self.set("focusedChild",nil)return true end;return false end function _c:mouse_up(dc,_d,ad) if ab.mouse_up(self,dc,_d,ad)then local bd=bc(self,"mouse_up",dc,_d,ad) -local cd,dd=cc(self,true,"mouse_up",table.unpack(bd))if(cd)then return true end end end;function _c:key(dc)if self.get("focusedChild")then return +local cd,dd=cc(self,true,"mouse_up",table.unpack(bd))if(cd)then return true end end;return false end;function _c:key(dc)if self.get("focusedChild")then return self.get("focusedChild"):dispatchEvent("key",dc)end return true end function _c:char(dc)if @@ -1069,22 +1069,23 @@ local a_a,b_a=self.get("width"),self.get("height")ad=dc<1 and math.min(ad+dc-1,a math.min(ad,math.max(0,a_a-dc+1))bd=_d<1 and math.min( bd+_d-1,b_a)or math.min(bd,math.max(0,b_a-_d+1))if ad<=0 or -bd<=0 then return end -ab.multiBlit(self,math.max(1,dc),math.max(1,_d),ad,bd,cd,dd,__a)end +bd<=0 then return self end +ab.multiBlit(self,math.max(1,dc),math.max(1,_d),ad,bd,cd,dd,__a)return self end function _c:textFg(dc,_d,ad,bd)local cd,dd=self.get("width"),self.get("height")if -_d<1 or _d>dd then return end;local __a=dc<1 and(2 -dc)or 1 -local a_a=math.min(#ad-__a+1, -cd-math.max(1,dc)+1)if a_a<=0 then return end -ab.textFg(self,math.max(1,dc),math.max(1,_d),ad:sub(__a,__a+a_a-1),bd)end +_d<1 or _d>dd then return self end;local __a=dc<1 and(2 -dc)or 1 +local a_a=math.min(#ad- +__a+1,cd-math.max(1,dc)+1)if a_a<=0 then return self end +ab.textFg(self,math.max(1,dc),math.max(1,_d),ad:sub(__a, +__a+a_a-1),bd)end function _c:blit(dc,_d,ad,bd,cd)local dd,__a=self.get("width"),self.get("height")if -_d<1 or _d>__a then return end;local a_a=dc<1 and(2 -dc)or 1 -local b_a=math.min(#ad-a_a+1, -dd-math.max(1,dc)+1) +_d<1 or _d>__a then return self end;local a_a=dc<1 and(2 -dc)or 1 +local b_a=math.min( +#ad-a_a+1,dd-math.max(1,dc)+1) local c_a=math.min(#bd-a_a+1,dd-math.max(1,dc)+1) -local d_a=math.min(#cd-a_a+1,dd-math.max(1,dc)+1)if b_a<=0 then return end;local _aa=ad:sub(a_a,a_a+b_a-1)local aaa=bd:sub(a_a, +local d_a=math.min(#cd-a_a+1,dd-math.max(1,dc)+1)if b_a<=0 then return self end;local _aa=ad:sub(a_a,a_a+b_a-1)local aaa=bd:sub(a_a, a_a+c_a-1) local baa=cd:sub(a_a,a_a+d_a-1) -ab.blit(self,math.max(1,dc),math.max(1,_d),_aa,aaa,baa)end +ab.blit(self,math.max(1,dc),math.max(1,_d),_aa,aaa,baa)return self end function _c:render()ab.render(self)if not self.get("childrenSorted")then self:sortChildren()end if