minor bugfixes - cleanup

This commit is contained in:
kepler155c@gmail.com 2020-04-22 23:37:12 -06:00
parent 7224d441ca
commit b0d2ce0199
5 changed files with 20 additions and 27 deletions

View File

@ -138,19 +138,6 @@ function page:eventHandler(event)
self:executeStatement('_ENV')
command = nil
elseif event.type == 'hide_output' then
self.output:disable()
self.titleBar.oy = -1
self.titleBar.event = 'show_output'
self.titleBar.closeInd = '^'
self.titleBar:resize()
self.grid.ey = -2
self.grid:resize()
self:draw()
elseif event.type == 'tab_select' then
self:setFocus(self.prompt)
@ -201,7 +188,7 @@ function page:eventHandler(event)
command = nil
self.grid:setValues(t)
self.grid:setIndex(1)
self:draw()
self.grid:draw()
end
return true
@ -247,7 +234,7 @@ function page:setResult(result)
end
self.grid:setValues(t)
self.grid:setIndex(1)
self:draw()
self.grid:draw()
end
function page.grid:eventHandler(event)

View File

@ -136,6 +136,19 @@ function tab:enable()
self:updateDrives()
self:updateInfo()
UI.Tab.enable(self)
self.handler = Event.on({ 'disk', 'disk_eject' }, function()
os.sleep(1)
if tab.enabled then
tab:updateDrives()
tab:updateInfo()
tab:sync()
end
end)
end
function tab:disable()
Event.off(self.handler)
UI.Tab.disable(self)
end
function tab:eventHandler(event)
@ -147,11 +160,4 @@ function tab:eventHandler(event)
return true
end
Event.on({ 'disk', 'disk_eject' }, function()
os.sleep(1)
tab:updateDrives()
tab:updateInfo()
tab:sync()
end)
return tab

View File

@ -361,7 +361,8 @@ function Canvas:__renderLayers(device, offset, doubleBuffer)
y = region[2] - offset.y,
ex = region[3] - offset.x,
ey = region[4] - offset.y },
{ x = region[1], y = region[2] }, doubleBuffer)
{ x = region[1], y = region[2] },
doubleBuffer)
end
self.regions = nil

View File

@ -12,6 +12,7 @@ UI.Checkbox.defaults = {
textColor = 'white',
backgroundColor = 'black',
backgroundFocusColor = 'lightGray',
event = 'checkbox_change',
height = 1,
width = 3,
accelerators = {
@ -52,7 +53,7 @@ end
function UI.Checkbox:eventHandler(event)
if event.type == 'checkbox_toggle' then
self.value = not self.value
self:emit({ type = 'checkbox_change', checked = self.value, element = self })
self:emit({ type = self.event, checked = self.value, element = self })
self:draw()
return true
end

View File

@ -77,9 +77,7 @@ function UI.TitleBar.example()
x = 2, y = 3,
text = 'Press',
},
focus = function (self)
self:raise()
end,
focus = UI.Window.raise,
},
draw = function(self, isBG)
for i = 1, self.height do