GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Small Fix

Browse Source 
- Fixed BaseFrame & Frames not setting correct cursor position, when there is a offset
This commit is contained in:
Robert Jelic
2023-05-06 14:46:44 +02:00
parent dda224bb53
commit e87557aba9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Basalt/objects/BaseFrame.lua
View File

@@ -174,12 +174,13 @@ return function(name, basalt)
setCursor = function(self, _blink, _xCursor, _yCursor, color) setCursor = function(self, _blink, _xCursor, _yCursor, color)
local obx, oby = self:getAbsolutePosition() local obx, oby = self:getAbsolutePosition()
local xO, yO = self:getOffset()
cursorBlink = _blink or false cursorBlink = _blink or false
if (_xCursor ~= nil) then if (_xCursor ~= nil) then
xCursor = obx + _xCursor - 1 xCursor = obx + _xCursor - 1 - xO
end end
if (_yCursor ~= nil) then if (_yCursor ~= nil) then
yCursor = oby + _yCursor - 1 yCursor = oby + _yCursor - 1 - yO
end end
cursorColor = color or cursorColor cursorColor = color or cursorColor
if (cursorBlink) then if (cursorBlink) then

3
Basalt/objects/Frame.lua
View File

@@ -81,7 +81,8 @@ return function(name, basalt)
setCursor = function(self, blink, x, y, color) setCursor = function(self, blink, x, y, color)
local obx, oby = self:getPosition() local obx, oby = self:getPosition()
parent:setCursor(blink or false, (x or 0)+obx-1, (y or 0)+oby-1, color or colors.white) local xO, yO = self:getOffset()
parent:setCursor(blink or false, (x or 0)+obx-1 - xO, (y or 0)+oby-1 - yO, color or colors.white)
return self return self
end, end,
} }

2
Basalt/objects/Input.lua
View File

@@ -17,7 +17,7 @@ return function(name, basalt)
local defaultText = "" local defaultText = ""
local defaultBGCol = colors.black local defaultBGCol = colors.black
local defaultFGCol = colors.white local defaultFGCol = colors.lightGray
local showingText = defaultText local showingText = defaultText
local internalValueChange = false local internalValueChange = false