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

changed slider issue, fixed monitor bug, added basalt.isKeyDown(keys)

Browse Source 
Slider: added setIndex() and changed setValue behaviour
Monitor: Changed monitor draw priority so input's cursor still shows (have to figure out why its even hiding)
added new function where you can check if a user is holding a key currently down
This commit is contained in:
Robert Jelic
2022-05-31 20:55:14 +02:00
parent 5aa57c0930
commit 11cdd74d39
8 changed files with 117 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
basalt-source.lua
View File

@@ -1,7 +1,7 @@
local basalt = { debugger = true, version = 1 }
local activeFrame
local frames = {}
local keyModifier = {}
local keyActive = {}
local parentTerminal = term.current()
local sub = string.sub
@@ -140,12 +140,11 @@ local function generateFontSize(size,yeld)
return true
end
generateFontSize(3,false)
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
@@ -3302,6 +3301,35 @@ local function Slider(name)
return self
end;
setValue = function(self, val)
index = math.floor(val / maxValue)
if (barType == "horizontal") then
if(index<1)then index = 1
elseif(index>self.width)then index = self.width end
base.setValue(self, maxValue / self.width * (index))
elseif (barType == "vertical") then
if(index<1)then index = 1
elseif(index>self.height)then index = self.height end
base.setValue(self, maxValue / self.height * (index))
end
return self
end;
setIndex = function(self, _index)
if (barType == "horizontal") then
if(_index>=1)and(_index<=self.width)then
index = _index
base.setValue(self, maxValue / self.width * (index))
end
elseif(barType == "vertical") then
if(_index>=1)and(_index<=self.height)then
index = _index
base.setValue(self, maxValue / self.height * (index))
end
end
return self
end;
mouseClickHandler = function(self, event, button, x, y)
if (base.mouseClickHandler(self, event, button, x, y)) then
local obx, oby = self:getAbsolutePosition(self:getAnchorPosition())
@@ -3309,7 +3337,7 @@ local function Slider(name)
for _index = 0, self.width - 1 do
if (obx + _index == x) and (oby <= y) and (oby + self.height > y) then
index = _index + 1
self:setValue(maxValue / self.width * (index))
base.setValue(self, maxValue / self.width * (index))
self:setVisualChanged()
end
end
@@ -3318,7 +3346,7 @@ local function Slider(name)
for _index = 0, self.height - 1 do
if (oby + _index == y) and (obx <= x) and (obx + self.width > x) then
index = _index + 1
self:setValue(maxValue / self.height * (index))
base.setValue(self, maxValue / self.height * (index))
self:setVisualChanged()
end
end
@@ -4291,6 +4319,9 @@ local function Frame(name, parent)
draw = function(self)
if (self:getVisualChanged()) then
if (base.draw(self)) then
for _,v in pairs(monitors)do
v.frame:draw()
end
local obx, oby = self:getAbsolutePosition(self:getAnchorPosition())
local anchx, anchy = self:getAnchorPosition()
if (self.parent ~= nil) then
@@ -4332,9 +4363,6 @@ local function Frame(name, parent)
end
self:setVisualChanged(false)
end
for _,v in pairs(monitors)do
v.frame:draw()
end
drawHelper.update()
end
end;
@@ -4489,7 +4517,15 @@ local function basaltUpdateEvent(event, p1, p2, p3, p4)
activeFrame:keyHandler(event, p1)
activeFrame:backgroundKeyHandler(event, p1)
end
if(event == "key")then
keyActive[p1] = true
end
if(event == "key_up")then
keyActive[p1] = false
end
for _, value in pairs(frames) do
value:eventHandler(event, p1, p2, p3, p4)
end
@@ -4520,6 +4556,11 @@ function basalt.stop()
updaterActive = false
end
function basalt.isKeyDown(key)
if(keyActive[key]==nil)then return false end
return keyActive[key];
end
function basalt.getFrame(name)
for _, value in pairs(frames) do
if (value.name == name) then

2
basalt.lua
View File

File diff suppressed because one or more lines are too long

16
source/Installer.lua Normal file
View File

@@ -0,0 +1,16 @@
--[[
To install basalt copy paste the following line to your computer:
pastebin run ESs1mg7P
---------------------------------------------
Hi, this is the installer for the UI Framework basalt!
currently its just a single file. In the near future i will split my project into multiple files and "compile" it to one single file on your computer.
You are curious what basalt is? check out my github wiki: https://github.com/NoryiE/Basalt/wiki/
----------------------------------------------
]]
local args = {...}
local defaultFilePath = args[1] or "basalt.lua"
shell.run("wget https://raw.githubusercontent.com/Pyroxenium/Basalt/master/basalt.lua "..defaultFilePath)

6
source/project/Frame.lua
View File

@@ -419,6 +419,9 @@ local function Frame(name, parent)
draw = function(self)
if (self:getVisualChanged()) then
if (base.draw(self)) then
for _,v in pairs(monitors)do
v.frame:draw()
end
local obx, oby = self:getAbsolutePosition(self:getAnchorPosition())
local anchx, anchy = self:getAnchorPosition()
if (self.parent ~= nil) then
@@ -460,9 +463,6 @@ local function Frame(name, parent)
end
self:setVisualChanged(false)
end
for _,v in pairs(monitors)do
v.frame:draw()
end
drawHelper.update()
end
end;

3
source/project/lib/bigfont.lua
View File

@@ -91,12 +91,11 @@ local function generateFontSize(size,yeld)
return true
end
generateFontSize(3,false)
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

15
source/project/mainBottom.lua
View File

@@ -14,7 +14,15 @@ local function basaltUpdateEvent(event, p1, p2, p3, p4)
activeFrame:keyHandler(event, p1)
activeFrame:backgroundKeyHandler(event, p1)
end
if(event == "key")then
keyActive[p1] = true
end
if(event == "key_up")then
keyActive[p1] = false
end
for _, value in pairs(frames) do
value:eventHandler(event, p1, p2, p3, p4)
end
@@ -45,6 +53,11 @@ function basalt.stop()
updaterActive = false
end
function basalt.isKeyDown(key)
if(keyActive[key]==nil)then return false end
return keyActive[key];
end
function basalt.getFrame(name)
for _, value in pairs(frames) do
if (value.name == name) then

2
source/project/mainTop.lua
View File

@@ -1,7 +1,7 @@
local basalt = { debugger = true, version = 1 }
local activeFrame
local frames = {}
local keyModifier = {}
local keyActive = {}
local parentTerminal = term.current()
local sub = string.sub

33
source/project/objects/Slider.lua
View File

@@ -42,6 +42,35 @@ local function Slider(name)
return self
end;
setValue = function(self, val)
index = math.floor(val / maxValue)
if (barType == "horizontal") then
if(index<1)then index = 1
elseif(index>self.width)then index = self.width end
base.setValue(self, maxValue / self.width * (index))
elseif (barType == "vertical") then
if(index<1)then index = 1
elseif(index>self.height)then index = self.height end
base.setValue(self, maxValue / self.height * (index))
end
return self
end;
setIndex = function(self, _index)
if (barType == "horizontal") then
if(_index>=1)and(_index<=self.width)then
index = _index
base.setValue(self, maxValue / self.width * (index))
end
elseif(barType == "vertical") then
if(_index>=1)and(_index<=self.height)then
index = _index
base.setValue(self, maxValue / self.height * (index))
end
end
return self
end;
mouseClickHandler = function(self, event, button, x, y)
if (base.mouseClickHandler(self, event, button, x, y)) then
local obx, oby = self:getAbsolutePosition(self:getAnchorPosition())
@@ -49,7 +78,7 @@ local function Slider(name)
for _index = 0, self.width - 1 do
if (obx + _index == x) and (oby <= y) and (oby + self.height > y) then
index = _index + 1
self:setValue(maxValue / self.width * (index))
base.setValue(self, maxValue / self.width * (index))
self:setVisualChanged()
end
end
@@ -58,7 +87,7 @@ local function Slider(name)
for _index = 0, self.height - 1 do
if (oby + _index == y) and (obx <= x) and (obx + self.width > x) then
index = _index + 1
self:setValue(maxValue / self.height * (index))
base.setValue(self, maxValue / self.height * (index))
self:setVisualChanged()
end
end