From d6931412c81c7f0754675ca9771e972f2b5e12a0 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Mon, 17 Apr 2023 17:42:11 +0200 Subject: [PATCH] Updated textfield - fixed paste-events by removing an outdated if-statement --- Basalt/objects/Textfield.lua | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Basalt/objects/Textfield.lua b/Basalt/objects/Textfield.lua index fd04a90..049b426 100644 --- a/Basalt/objects/Textfield.lua +++ b/Basalt/objects/Textfield.lua @@ -666,22 +666,21 @@ return function(name) end, eventHandler = function(self, event, paste, p2, p3, p4) - if(base.eventHandler(self, event, paste, p2, p3, p4))then - if(event=="paste")then - if(self:isFocused())then - local w, h = self:getSize() - lines[textY] = lines[textY]:sub(1, textX - 1) .. paste .. lines[textY]:sub(textX, lines[textY]:len()) - fgLines[textY] = fgLines[textY]:sub(1, textX - 1) .. tHex[self.fgColor]:rep(paste:len()) .. fgLines[textY]:sub(textX, fgLines[textY]:len()) - bgLines[textY] = bgLines[textY]:sub(1, textX - 1) .. tHex[self.bgColor]:rep(paste:len()) .. bgLines[textY]:sub(textX, bgLines[textY]:len()) - textX = textX + paste:len() - if (textX >= w + wIndex) then - wIndex = (textX+1)-w - end - local anchx, anchy = self:getAnchorPosition() - self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor) - updateColors(self) - self:updateDraw() + base.eventHandler(self, event, paste, p2, p3, p4) + if(event=="paste")then + if(self:isFocused())then + local w, h = self:getSize() + lines[textY] = lines[textY]:sub(1, textX - 1) .. paste .. lines[textY]:sub(textX, lines[textY]:len()) + fgLines[textY] = fgLines[textY]:sub(1, textX - 1) .. tHex[self.fgColor]:rep(paste:len()) .. fgLines[textY]:sub(textX, fgLines[textY]:len()) + bgLines[textY] = bgLines[textY]:sub(1, textX - 1) .. tHex[self.bgColor]:rep(paste:len()) .. bgLines[textY]:sub(textX, bgLines[textY]:len()) + textX = textX + paste:len() + if (textX >= w + wIndex) then + wIndex = (textX+1)-w end + local anchx, anchy = self:getAnchorPosition() + self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor) + updateColors(self) + self:updateDraw() end end end,