From 1eddd209f0d51bc12e3dcbcbf2601b4d7074c1d5 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Sun, 7 May 2023 17:02:49 +0200 Subject: [PATCH] Small fix - Fixed monitor frames not receiving other events --- Basalt/libraries/utils.lua | 2 +- Basalt/main.lua | 3 +++ Basalt/objects/BaseFrame.lua | 13 ------------- Basalt/objects/Container.lua | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Basalt/libraries/utils.lua b/Basalt/libraries/utils.lua index 059005b..3c0fbc1 100644 --- a/Basalt/libraries/utils.lua +++ b/Basalt/libraries/utils.lua @@ -340,7 +340,7 @@ wrapRichText = wrapRichText, --- @param height number Height writeWrappedText = function(obj, x, y, text, width, height) local wrapped = wrapRichText(text, width) - for k,v in pairs(wrapped)do + for _,v in pairs(wrapped)do if(v.y>height)then break end diff --git a/Basalt/main.lua b/Basalt/main.lua index 7d2a524..65a3105 100644 --- a/Basalt/main.lua +++ b/Basalt/main.lua @@ -306,6 +306,9 @@ local function basaltUpdateEvent(event, ...) for k, v in pairs(frames) do v:eventHandler(event, ...) end + for k, v in pairs(monFrames) do + v:eventHandler(event, ...) + end handleSchedules(event, ...) renderingUpdateEvent() end diff --git a/Basalt/objects/BaseFrame.lua b/Basalt/objects/BaseFrame.lua index 7b438e3..c990252 100644 --- a/Basalt/objects/BaseFrame.lua +++ b/Basalt/objects/BaseFrame.lua @@ -41,19 +41,6 @@ return function(name, basalt) return self end, - show = function(self) - base.show(self) - for k,v in pairs(colorTheme)do - if(type(v)=="number")then - termObject.setPaletteColor(type(k)=="number" and k or colors[k], v) - else - local r,g,b = table.unpack(v) - termObject.setPaletteColor(type(k)=="number" and k or colors[k], r,g,b) - end - end - return self - end, - setPalette = function(self, col, ...) if(self==basalt.getActiveFrame())then if(type(col)=="string")then diff --git a/Basalt/objects/Container.lua b/Basalt/objects/Container.lua index 9b31021..a1d509b 100644 --- a/Basalt/objects/Container.lua +++ b/Basalt/objects/Container.lua @@ -318,7 +318,7 @@ return function(name, basalt) return self end, - eventHandler = function(self, ...) + eventHandler = function(self, ...) if(base.eventHandler~=nil)then base.eventHandler(self, ...) if(events["other_event"]~=nil)then