diff --git a/.gitignore b/.gitignore index cc3a404..6d5ff3d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ test.xml ascii.lua tests testWorkflows -basaltImage.lua \ No newline at end of file +basaltImage.lua +.vscode \ No newline at end of file diff --git a/src/elements/BigFont.lua b/src/elements/BigFont.lua new file mode 100644 index 0000000..d0687a3 --- /dev/null +++ b/src/elements/BigFont.lua @@ -0,0 +1,197 @@ +---@splitClass +------------------------------------------------------------------------------------- +-- Wojbies API 5.0 - Bigfont - functions to write bigger font using drawing sybols -- +------------------------------------------------------------------------------------- +-- Copyright (c) 2015-2025 Wojbie (wojbie@wojbie.net) +-- Redistribution and use in source and binary forms, with or without modification, are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met: +-- 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +-- 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +-- 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +-- 4. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +-- 5. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. +-- NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED, LICENSED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION, OPERATION OR MAINTENANCE OF ANY NUCLEAR FACILITY. + +-- Basalt - Nyorie: Please don't copy paste this code to your projects, this code is slightly changed (to fit the way basalt draws stuff), if you want the original code, checkout this: +-- http://www.computercraft.info/forums2/index.php?/topic/25367-bigfont-api-write-bigger-letters-v10/ +---@class BigFontText +local tHex = require("libraries/colorHex") + +local rawFont = {{"\32\32\32\137\156\148\158\159\148\135\135\144\159\139\32\136\157\32\159\139\32\32\143\32\32\143\32\32\32\32\32\32\32\32\147\148\150\131\148\32\32\32\151\140\148\151\140\147", "\32\32\32\149\132\149\136\156\149\144\32\133\139\159\129\143\159\133\143\159\133\138\32\133\138\32\133\32\32\32\32\32\32\150\150\129\137\156\129\32\32\32\133\131\129\133\131\132", "\32\32\32\130\131\32\130\131\32\32\129\32\32\32\32\130\131\32\130\131\32\32\32\32\143\143\143\32\32\32\32\32\32\130\129\32\130\135\32\32\32\32\131\32\32\131\32\131", "\139\144\32\32\143\148\135\130\144\149\32\149\150\151\149\158\140\129\32\32\32\135\130\144\135\130\144\32\149\32\32\139\32\159\148\32\32\32\32\159\32\144\32\148\32\147\131\132", "\159\135\129\131\143\149\143\138\144\138\32\133\130\149\149\137\155\149\159\143\144\147\130\132\32\149\32\147\130\132\131\159\129\139\151\129\148\32\32\139\131\135\133\32\144\130\151\32", "\32\32\32\32\32\32\130\135\32\130\32\129\32\129\129\131\131\32\130\131\129\140\141\132\32\129\32\32\129\32\32\32\32\32\32\32\131\131\129\32\32\32\32\32\32\32\32\32", "\32\32\32\32\149\32\159\154\133\133\133\144\152\141\132\133\151\129\136\153\32\32\154\32\159\134\129\130\137\144\159\32\144\32\148\32\32\32\32\32\32\32\32\32\32\32\151\129", "\32\32\32\32\133\32\32\32\32\145\145\132\141\140\132\151\129\144\150\146\129\32\32\32\138\144\32\32\159\133\136\131\132\131\151\129\32\144\32\131\131\129\32\144\32\151\129\32", "\32\32\32\32\129\32\32\32\32\130\130\32\32\129\32\129\32\129\130\129\129\32\32\32\32\130\129\130\129\32\32\32\32\32\32\32\32\133\32\32\32\32\32\129\32\129\32\32", "\150\156\148\136\149\32\134\131\148\134\131\148\159\134\149\136\140\129\152\131\32\135\131\149\150\131\148\150\131\148\32\148\32\32\148\32\32\152\129\143\143\144\130\155\32\134\131\148", "\157\129\149\32\149\32\152\131\144\144\131\148\141\140\149\144\32\149\151\131\148\32\150\32\150\131\148\130\156\133\32\144\32\32\144\32\130\155\32\143\143\144\32\152\129\32\134\32", "\130\131\32\131\131\129\131\131\129\130\131\32\32\32\129\130\131\32\130\131\32\32\129\32\130\131\32\130\129\32\32\129\32\32\133\32\32\32\129\32\32\32\130\32\32\32\129\32", "\150\140\150\137\140\148\136\140\132\150\131\132\151\131\148\136\147\129\136\147\129\150\156\145\138\143\149\130\151\32\32\32\149\138\152\129\149\32\32\157\152\149\157\144\149\150\131\148", "\149\143\142\149\32\149\149\32\149\149\32\144\149\32\149\149\32\32\149\32\32\149\32\149\149\32\149\32\149\32\144\32\149\149\130\148\149\32\32\149\32\149\149\130\149\149\32\149", "\130\131\129\129\32\129\131\131\32\130\131\32\131\131\32\131\131\129\129\32\32\130\131\32\129\32\129\130\131\32\130\131\32\129\32\129\131\131\129\129\32\129\129\32\129\130\131\32", "\136\140\132\150\131\148\136\140\132\153\140\129\131\151\129\149\32\149\149\32\149\149\32\149\137\152\129\137\152\129\131\156\133\149\131\32\150\32\32\130\148\32\152\137\144\32\32\32", "\149\32\32\149\159\133\149\32\149\144\32\149\32\149\32\149\32\149\150\151\129\138\155\149\150\130\148\32\149\32\152\129\32\149\32\32\32\150\32\32\149\32\32\32\32\32\32\32", "\129\32\32\130\129\129\129\32\129\130\131\32\32\129\32\130\131\32\32\129\32\129\32\129\129\32\129\32\129\32\131\131\129\130\131\32\32\32\129\130\131\32\32\32\32\140\140\132", "\32\154\32\159\143\32\149\143\32\159\143\32\159\144\149\159\143\32\159\137\145\159\143\144\149\143\32\32\145\32\32\32\145\149\32\144\32\149\32\143\159\32\143\143\32\159\143\32", "\32\32\32\152\140\149\151\32\149\149\32\145\149\130\149\157\140\133\32\149\32\154\143\149\151\32\149\32\149\32\144\32\149\149\153\32\32\149\32\149\133\149\149\32\149\149\32\149", "\32\32\32\130\131\129\131\131\32\130\131\32\130\131\129\130\131\129\32\129\32\140\140\129\129\32\129\32\129\32\137\140\129\130\32\129\32\130\32\129\32\129\129\32\129\130\131\32", "\144\143\32\159\144\144\144\143\32\159\143\144\159\138\32\144\32\144\144\32\144\144\32\144\144\32\144\144\32\144\143\143\144\32\150\129\32\149\32\130\150\32\134\137\134\134\131\148", "\136\143\133\154\141\149\151\32\129\137\140\144\32\149\32\149\32\149\154\159\133\149\148\149\157\153\32\154\143\149\159\134\32\130\148\32\32\149\32\32\151\129\32\32\32\32\134\32", "\133\32\32\32\32\133\129\32\32\131\131\32\32\130\32\130\131\129\32\129\32\130\131\129\129\32\129\140\140\129\131\131\129\32\130\129\32\129\32\130\129\32\32\32\32\32\129\32", "\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32", "\32\32\32\32\32\32\32\32\32\32\32\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\32\32\32\32\32\32\32\32\32\32\32", "\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32\32", "\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32\32\32\32\32\149\32\32\149\32\32\32\32", "\32\32\32\32\32\32\32\32\32\32\32\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\32\32\32\32\32\32\32\32\32\32\32", "\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32\32\149\32", "\32\32\32\32\145\32\159\139\32\151\131\132\155\143\132\134\135\145\32\149\32\158\140\129\130\130\32\152\147\155\157\134\32\32\144\144\32\32\32\32\32\32\152\131\155\131\131\129", "\32\32\32\32\149\32\149\32\145\148\131\32\149\32\149\140\157\132\32\148\32\137\155\149\32\32\32\149\154\149\137\142\32\153\153\32\131\131\149\131\131\129\149\135\145\32\32\32", "\32\32\32\32\129\32\130\135\32\131\131\129\134\131\132\32\129\32\32\129\32\131\131\32\32\32\32\130\131\129\32\32\32\32\129\129\32\32\32\32\32\32\130\131\129\32\32\32", "\150\150\32\32\148\32\134\32\32\132\32\32\134\32\32\144\32\144\150\151\149\32\32\32\32\32\32\145\32\32\152\140\144\144\144\32\133\151\129\133\151\129\132\151\129\32\145\32", "\130\129\32\131\151\129\141\32\32\142\32\32\32\32\32\149\32\149\130\149\149\32\143\32\32\32\32\142\132\32\154\143\133\157\153\132\151\150\148\151\158\132\151\150\148\144\130\148", "\32\32\32\140\140\132\32\32\32\32\32\32\32\32\32\151\131\32\32\129\129\32\32\32\32\134\32\32\32\32\32\32\32\129\129\32\129\32\129\129\130\129\129\32\129\130\131\32", "\156\143\32\159\141\129\153\140\132\153\137\32\157\141\32\159\142\32\150\151\129\150\131\132\140\143\144\143\141\145\137\140\148\141\141\144\157\142\32\159\140\32\151\134\32\157\141\32", "\157\140\149\157\140\149\157\140\149\157\140\149\157\140\149\157\140\149\151\151\32\154\143\132\157\140\32\157\140\32\157\140\32\157\140\32\32\149\32\32\149\32\32\149\32\32\149\32", "\129\32\129\129\32\129\129\32\129\129\32\129\129\32\129\129\32\129\129\131\129\32\134\32\131\131\129\131\131\129\131\131\129\131\131\129\130\131\32\130\131\32\130\131\32\130\131\32", "\151\131\148\152\137\145\155\140\144\152\142\145\153\140\132\153\137\32\154\142\144\155\159\132\150\156\148\147\32\144\144\130\145\136\137\32\146\130\144\144\130\145\130\136\32\151\140\132", "\151\32\149\151\155\149\149\32\149\149\32\149\149\32\149\149\32\149\149\32\149\152\137\144\157\129\149\149\32\149\149\32\149\149\32\149\149\32\149\130\150\32\32\157\129\149\32\149", "\131\131\32\129\32\129\130\131\32\130\131\32\130\131\32\130\131\32\130\131\32\32\32\32\130\131\32\130\131\32\130\131\32\130\131\32\130\131\32\32\129\32\130\131\32\133\131\32", "\156\143\32\159\141\129\153\140\132\153\137\32\157\141\32\159\142\32\159\159\144\152\140\144\156\143\32\159\141\129\153\140\132\157\141\32\130\145\32\32\147\32\136\153\32\130\146\32", "\152\140\149\152\140\149\152\140\149\152\140\149\152\140\149\152\140\149\149\157\134\154\143\132\157\140\133\157\140\133\157\140\133\157\140\133\32\149\32\32\149\32\32\149\32\32\149\32", "\130\131\129\130\131\129\130\131\129\130\131\129\130\131\129\130\131\129\130\130\131\32\134\32\130\131\129\130\131\129\130\131\129\130\131\129\32\129\32\32\129\32\32\129\32\32\129\32", "\159\134\144\137\137\32\156\143\32\159\141\129\153\140\132\153\137\32\157\141\32\32\132\32\159\143\32\147\32\144\144\130\145\136\137\32\146\130\144\144\130\145\130\138\32\146\130\144", "\149\32\149\149\32\149\149\32\149\149\32\149\149\32\149\149\32\149\149\32\149\131\147\129\138\134\149\149\32\149\149\32\149\149\32\149\149\32\149\154\143\149\32\157\129\154\143\149", "\130\131\32\129\32\129\130\131\32\130\131\32\130\131\32\130\131\32\130\131\32\32\32\32\130\131\32\130\131\129\130\131\129\130\131\129\130\131\129\140\140\129\130\131\32\140\140\129" }, {"000110000110110000110010101000000010000000100101", "000000110110000000000010101000000010000000100101", "000000000000000000000000000000000000000000000000", "100010110100000010000110110000010100000100000110", "000000110000000010110110000110000000000000110000", "000000000000000000000000000000000000000000000000", "000000110110000010000000100000100000000000000010", "000000000110110100010000000010000000000000000100", "000000000000000000000000000000000000000000000000", "010000000000100110000000000000000000000110010000", "000000000000000000000000000010000000010110000000", "000000000000000000000000000000000000000000000000", "011110110000000100100010110000000100000000000000", "000000000000000000000000000000000000000000000000", "000000000000000000000000000000000000000000000000", "110000110110000000000000000000010100100010000000", "000010000000000000110110000000000100010010000000", "000000000000000000000000000000000000000000000000", "010110010110100110110110010000000100000110110110", "000000000000000000000110000000000110000000000000", "000000000000000000000000000000000000000000000000", "010100010110110000000000000000110000000010000000", "110110000000000000110000110110100000000010000000", "000000000000000000000000000000000000000000000000", "000100011111000100011111000100011111000100011111", "000000000000100100100100011011011011111111111111", "000000000000000000000000000000000000000000000000", "000100011111000100011111000100011111000100011111", "000000000000100100100100011011011011111111111111", "100100100100100100100100100100100100100100100100", "000000110100110110000010000011110000000000011000", "000000000100000000000010000011000110000000001000", "000000000000000000000000000000000000000000000000", "010000100100000000000000000100000000010010110000", "000000000000000000000000000000110110110110110000", "000000000000000000000000000000000000000000000000", "110110110110110110000000110110110110110110110110", "000000000000000000000110000000000000000000000000", "000000000000000000000000000000000000000000000000", "000000000000110110000110010000000000000000010010", "000010000000000000000000000000000000000000000000", "000000000000000000000000000000000000000000000000", "110110110110110110110000110110110110000000000000", "000000000000000000000110000000000000000000000000", "000000000000000000000000000000000000000000000000", "110110110110110110110000110000000000000000010000", "000000000000000000000000100000000000000110000110", "000000000000000000000000000000000000000000000000" }} + +local fonts = {} +local firstFont = {} +do + local char = 0 + local height = #rawFont[1] + local length = #rawFont[1][1] + for i = 1, height, 3 do + for j = 1, length, 3 do + local thisChar = string.char(char) + + local temp = {} + temp[1] = rawFont[1][i]:sub(j, j + 2) + temp[2] = rawFont[1][i + 1]:sub(j, j + 2) + temp[3] = rawFont[1][i + 2]:sub(j, j + 2) + + local temp2 = {} + temp2[1] = rawFont[2][i]:sub(j, j + 2) + temp2[2] = rawFont[2][i + 1]:sub(j, j + 2) + temp2[3] = rawFont[2][i + 2]:sub(j, j + 2) + + firstFont[thisChar] = {temp, temp2} + char = char + 1 + end + end + fonts[1] = firstFont +end + +local function generateFontSize(size,yeld) + local inverter = {["0"] = "1", ["1"] = "0"} + if size<= #fonts then return true end + for f = #fonts+1, size do + local nextFont = {} + local lastFont = fonts[f - 1] + for char = 0, 255 do + local thisChar = string.char(char) + + local temp = {} + local temp2 = {} + + local templateChar = lastFont[thisChar][1] + local templateBack = lastFont[thisChar][2] + for i = 1, #templateChar do + local line1, line2, line3, back1, back2, back3 = {}, {}, {}, {}, {}, {} + for j = 1, #templateChar[1] do + local currentChar = firstFont[templateChar[i]:sub(j, j)][1] + table.insert(line1, currentChar[1]) + table.insert(line2, currentChar[2]) + table.insert(line3, currentChar[3]) + + local currentBack = firstFont[templateChar[i]:sub(j, j)][2] + if templateBack[i]:sub(j, j) == "1" then + table.insert(back1, (currentBack[1]:gsub("[01]", inverter))) + table.insert(back2, (currentBack[2]:gsub("[01]", inverter))) + table.insert(back3, (currentBack[3]:gsub("[01]", inverter))) + else + table.insert(back1, currentBack[1]) + table.insert(back2, currentBack[2]) + table.insert(back3, currentBack[3]) + end + end + table.insert(temp, table.concat(line1)) + table.insert(temp, table.concat(line2)) + table.insert(temp, table.concat(line3)) + table.insert(temp2, table.concat(back1)) + table.insert(temp2, table.concat(back2)) + table.insert(temp2, table.concat(back3)) + end + + nextFont[thisChar] = {temp, temp2} + if yeld then yeld = "Font"..f.."Yeld"..char os.queueEvent(yeld) os.pullEvent(yeld) end + end + fonts[f] = nextFont + end + return true +end + +local function makeText(nSize, sString, nFC, nBC, bBlit) + if not type(sString) == "string" then error("Not a String",3) end --this should never happend with expects in place. + local cFC = type(nFC) == "string" and nFC:sub(1, 1) or tHex[nFC] or error("Wrong Front Color",3) + local cBC = type(nBC) == "string" and nBC:sub(1, 1) or tHex[nBC] or error("Wrong Back Color",3) + if(fonts[nSize]==nil)then generateFontSize(3,false) end + local font = fonts[nSize] or error("Wrong font size selected",3) + if sString == "" then return {{""}, {""}, {""}} end + + local input = {} + for i in sString:gmatch('.') do table.insert(input, i) end + + local tText = {} + local height = #font[input[1]][1] + + + for nLine = 1, height do + local outLine = {} + for i = 1, #input do + outLine[i] = font[input[i]] and font[input[i]][1][nLine] or "" + end + tText[nLine] = table.concat(outLine) + end + + local tFront = {} + local tBack = {} + local tFrontSub = {["0"] = cFC, ["1"] = cBC} + local tBackSub = {["0"] = cBC, ["1"] = cFC} + + for nLine = 1, height do + local front = {} + local back = {} + for i = 1, #input do + local template = font[input[i]] and font[input[i]][2][nLine] or "" + front[i] = template:gsub("[01]", bBlit and {["0"] = nFC:sub(i, i), ["1"] = nBC:sub(i, i)} or tFrontSub) + back[i] = template:gsub("[01]", bBlit and {["0"] = nBC:sub(i, i), ["1"] = nFC:sub(i, i)} or tBackSub) + end + tFront[nLine] = table.concat(front) + tBack[nLine] = table.concat(back) + end + + return {tText, tFront, tBack} +end + + +local elementManager = require("elementManager") +local VisualElement = elementManager.getElement("VisualElement") +---@cofnigDescription The BigFont is a text element that displays large text. +---@configDefault false + +--- The BigFont element is a text element that displays large text. +---@class BigFont : VisualElement +local BigFont = setmetatable({}, VisualElement) +BigFont.__index = BigFont + +---@property text string BigFont BigFont text +BigFont.defineProperty(BigFont, "text", {default = "BigFont", type = "string", canTriggerRender = true, setter=function(self, value) + self.bigfontText = makeText(self.get("fontSize"), value, self.get("foreground"), self.get("background")) + return value +end}) +---@property fontSize number 1 The font size of the BigFont +BigFont.defineProperty(BigFont, "fontSize", {default = 1, type = "number", canTriggerRender = true, setter=function(self, value) + self.bigfontText = makeText(value, self.get("text"), self.get("foreground"), self.get("background")) + return value +end}) + +--- @shortDescription Creates a new BigFont instance +--- @return table self The created instance +--- @private +function BigFont.new() + local self = setmetatable({}, BigFont):__init() + self.set("width", 16) + self.set("height", 3) + self.set("z", 5) + return self +end + +--- @shortDescription Initializes the BigFont instance +--- @param props table The properties to initialize the element with +--- @param basalt table The basalt instance +--- @protected +function BigFont:init(props, basalt) + VisualElement.init(self, props, basalt) + self.set("type", "BigFont") +end + +--- @shortDescription Renders the BigFont +--- @protected +function BigFont:render() + VisualElement.render(self) + if(self.bigfontText)then + local x, y = self.get("x"), self.get("y") + for i = 1, #self.bigfontText[1] do + local text = self.bigfontText[1][i]:sub(1, self.get("width")) + local fg = self.bigfontText[2][i]:sub(1, self.get("width")) + local bg = self.bigfontText[3][i]:sub(1, self.get("width")) + self:blit(x, y + i - 1, text, fg, bg) + end + end +end + +return BigFont \ No newline at end of file diff --git a/src/elements/Frame.lua b/src/elements/Frame.lua index 22e09ca..518b8a5 100644 --- a/src/elements/Frame.lua +++ b/src/elements/Frame.lua @@ -1,4 +1,5 @@ local elementManager = require("elementManager") +local VisualElement = elementManager.getElement("VisualElement") local Container = elementManager.getElement("Container") ---@configDescription A frame element that serves as a grouping container for other elements. @@ -7,6 +8,17 @@ local Container = elementManager.getElement("Container") local Frame = setmetatable({}, Container) Frame.__index = Frame +---@property draggable boolean false Whether the frame is draggable +Frame.defineProperty(Frame, "draggable", {default = false, type = "boolean", setter=function(self, value) + if value then + self:listenEvent("mouse_click", true) + self:listenEvent("mouse_up", true) + self:listenEvent("mouse_drag", true) + end +end}) +---@property draggingMap table {{x=1, y=1, width="width", height=1}} The map of dragging positions +Frame.defineProperty(Frame, "draggingMap", {default = {{x=1, y=1, width="width", height=1}}, type = "table"}) + --- Creates a new Frame instance --- @shortDescription Creates a new Frame instance --- @return Frame self The newly created Frame instance @@ -31,4 +43,77 @@ function Frame:init(props, basalt) return self end +--- @shortDescription Handles mouse click events +--- @param button number The button that was clicked +--- @param x number The x position of the click +--- @param y number The y position of the click +--- @return boolean handled Whether the event was handled +--- @protected +function Frame:mouse_click(button, x, y) + if(VisualElement.mouse_click(self, button, x, y)) then + local relX, relY = self:getRelativePosition(x, y) + local draggingMap = self.get("draggingMap") + + for _, map in ipairs(draggingMap) do + local width = map.width + local height = map.height or 1 + + if type(width) == "string" and width == "width" then + width = self.get("width") + elseif type(width) == "function" then + width = width(self) + end + if type(height) == "string" and height == "height" then + height = self.get("height") + elseif type(height) == "function" then + height = height(self) + end + + local mapY = map.y or 1 + if relX >= map.x and relX <= map.x + width - 1 and + relY >= mapY and relY <= mapY + height - 1 then + self.dragStartX = x - self.get("x") + self.dragStartY = y - self.get("y") + self.dragging = true + return true + end + end + return Container.mouse_click(self, button, x, y) + end +end + +--- @shortDescription Handles mouse drag events +--- @param button number The button that was clicked +--- @param x number The x position of the drag position +--- @param y number The y position of the drag position +--- @return boolean handled Whether the event was handled +--- @protected +function Frame:mouse_drag(button, x, y) + if self.get("clicked") and self.dragging then + local newX = x - self.dragStartX + local newY = y - self.dragStartY + + self.set("x", newX) + self.set("y", newY) + return true + end + if not self.dragging then + return Container.mouse_drag(self, button, x, y) + end + return false +end + +--- @shortDescription Handles mouse release events +--- @param button number The button that was released +--- @param x number The x position of the release +--- @param y number The y position of the release +--- @return boolean handled Whether the event was handled +--- @protected +function Frame:mouse_release(button, x, y) + self.dragging = false + self.dragStartX = nil + self.dragStartY = nil + return Container.mouse_release(self, button, x, y) +end + return Frame \ No newline at end of file diff --git a/src/elements/VisualElement.lua b/src/elements/VisualElement.lua index abd61aa..ffa89e5 100644 --- a/src/elements/VisualElement.lua +++ b/src/elements/VisualElement.lua @@ -386,6 +386,20 @@ function VisualElement:setCursor(x, y, blink, color) return self end +--- This function is used to prioritize the element by moving it to the top of its parent's children. +--- It removes the element from its parent and adds it back, effectively changing its order. +--- @shortDescription Prioritizes the element by moving it to the top of its parent's children +--- @return VisualElement self The VisualElement instance +function VisualElement:prioritize() + if(self.parent)then + local parent = self.parent + parent:removeChild(self) + parent:addChild(self) + self:updateRender() + end + return self +end + --- @shortDescription Renders the element --- @protected function VisualElement:render() diff --git a/src/render.lua b/src/render.lua index 9f59962..8b2ca48 100644 --- a/src/render.lua +++ b/src/render.lua @@ -232,7 +232,7 @@ function Render:render() self.buffer.dirtyRects = {} if self.blink then - self.terminal.setTextColor(self.cursorColor) + self.terminal.setTextColor(self.cursorColor or colors.white) self.terminal.setCursorPos(self.xCursor, self.yCursor) self.terminal.setCursorBlink(true) else