Small fix
- Fixed monitor frames not receiving other events
This commit is contained in:
@@ -340,7 +340,7 @@ wrapRichText = wrapRichText,
|
|||||||
--- @param height number Height
|
--- @param height number Height
|
||||||
writeWrappedText = function(obj, x, y, text, width, height)
|
writeWrappedText = function(obj, x, y, text, width, height)
|
||||||
local wrapped = wrapRichText(text, width)
|
local wrapped = wrapRichText(text, width)
|
||||||
for k,v in pairs(wrapped)do
|
for _,v in pairs(wrapped)do
|
||||||
if(v.y>height)then
|
if(v.y>height)then
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -306,6 +306,9 @@ local function basaltUpdateEvent(event, ...)
|
|||||||
for k, v in pairs(frames) do
|
for k, v in pairs(frames) do
|
||||||
v:eventHandler(event, ...)
|
v:eventHandler(event, ...)
|
||||||
end
|
end
|
||||||
|
for k, v in pairs(monFrames) do
|
||||||
|
v:eventHandler(event, ...)
|
||||||
|
end
|
||||||
handleSchedules(event, ...)
|
handleSchedules(event, ...)
|
||||||
renderingUpdateEvent()
|
renderingUpdateEvent()
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -41,19 +41,6 @@ return function(name, basalt)
|
|||||||
return self
|
return self
|
||||||
end,
|
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, ...)
|
setPalette = function(self, col, ...)
|
||||||
if(self==basalt.getActiveFrame())then
|
if(self==basalt.getActiveFrame())then
|
||||||
if(type(col)=="string")then
|
if(type(col)=="string")then
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ return function(name, basalt)
|
|||||||
return self
|
return self
|
||||||
end,
|
end,
|
||||||
|
|
||||||
eventHandler = function(self, ...)
|
eventHandler = function(self, ...)
|
||||||
if(base.eventHandler~=nil)then
|
if(base.eventHandler~=nil)then
|
||||||
base.eventHandler(self, ...)
|
base.eventHandler(self, ...)
|
||||||
if(events["other_event"]~=nil)then
|
if(events["other_event"]~=nil)then
|
||||||
|
|||||||
Reference in New Issue
Block a user