MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove a few screen savers - some bugfixes

Browse Source
This commit is contained in:
kepler155c@gmail.com
2020-04-22 23:36:03 -06:00
parent 4576969739
commit 8d014c0098
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ccemux/system/ccemux.lua
View File

@@ -46,6 +46,7 @@ local tab = UI.Tab {
columns = { columns = {
{ heading = 'Side', key = 'side', width = 8 }, { heading = 'Side', key = 'side', width = 8 },
{ heading = 'Type', key = 'type' }, { heading = 'Type', key = 'type' },
{ heading = 'ID', key = 'args', width = 4 },
}, },
}, },
} }
@@ -56,7 +57,7 @@ function tab:updatePeripherals(config)
table.insert(self.grid.values, { table.insert(self.grid.values, {
side = k, side = k,
type = v.type, type = v.type,
args = v.args, args = v.args and v.args.id,
}) })
end end
self.grid:update() self.grid:update()
@@ -83,7 +84,6 @@ function tab:eventHandler(event)
self:emit({ type = 'error_message', message = 'Invalid drive ID' }) self:emit({ type = 'error_message', message = 'Invalid drive ID' })
else else
ccemux.detach(event.values.side) ccemux.detach(event.values.side)
ccemux.attach(event.values.side, event.values.type)
local config = Config.load('ccemux') local config = Config.load('ccemux')
config[event.values.side] = { config[event.values.side] = {
@@ -93,6 +93,9 @@ function tab:eventHandler(event)
config[event.values.side].args = { config[event.values.side].args = {
id = event.values.drive_id id = event.values.drive_id
} }
ccemux.attach(event.values.side, event.values.type, { id = event.values.drive_id })
else
ccemux.attach(event.values.side, event.values.type)
end end
Config.update('ccemux', config) Config.update('ccemux', config)
self:updatePeripherals(config) self:updatePeripherals(config)

4
common/DiskCopy.lua
View File

@@ -94,7 +94,7 @@ function page:enable()
self.eject.value = config.eject self.eject.value = config.eject
self.automatic.value = config.automatic self.automatic.value = config.automatic
self.dir.x = math.floor((self.width / 2) - 3) + 1 self.dir:move(math.floor((self.width / 2) - 3) + 1, self.dir.y)
UI.Page.enable(self) UI.Page.enable(self)
end end
@@ -218,7 +218,7 @@ function page:copy()
self.progress:sync() self.progress:sync()
self.progress.value = 0 self.progress.value = 0
self.progress:clear() -- self.progress:clear()
self:scan() self:scan()

4
common/Events.lua
View File

@@ -43,10 +43,6 @@ local page = UI.Page {
return row return row
end, end,
draw = function(self)
self:adjustWidth()
UI.Grid.draw(self)
end,
}, },
accelerators = { accelerators = {
f = 'filter', f = 'filter',

6
common/edit.lua
View File

@@ -575,6 +575,10 @@ local page = UI.Page {
actions.dirty_all() actions.dirty_all()
actions.redraw() actions.redraw()
end, end,
setCursorPos = function(self, cx, cy)
self.cursorBlink = cy >= 1 and cy <= self.height
UI.Window.setCursorPos(self, cx, cy)
end,
draw = function() draw = function()
actions.redraw() actions.redraw()
end, end,
@@ -715,7 +719,7 @@ local function redraw()
if dirty.y > 0 then if dirty.y > 0 then
for dy = 1, h do for dy = 1, h do
local sLine = tLines[dy + scrollY] local sLine = tLines[dy + scrollY]
if sLine ~= nil then if sLine and #sLine > 0 then
if dy + scrollY >= dirty.y and dy + scrollY <= dirty.ey then if dy + scrollY >= dirty.y and dy + scrollY <= dirty.ey then
page.editor:clearLine(dy) page.editor:clearLine(dy)
writeHighlighted(sLine, dy + scrollY, dy) writeHighlighted(sLine, dy + scrollY, dy)

4
screenSaver/etc/fstab
View File

@@ -4,11 +4,11 @@ packages/screenSaver/savers/visualizer.lua urlfs https://raw.githubusercontent.c
packages/screenSaver/savers/random.lua urlfs https://pastebin.com/raw/XXW0r5zt packages/screenSaver/savers/random.lua urlfs https://pastebin.com/raw/XXW0r5zt
packages/screenSaver/savers/melting.lua urlfs http://pastebin.com/raw/raUv6Pap packages/screenSaver/savers/melting.lua urlfs http://pastebin.com/raw/raUv6Pap
packages/screenSaver/savers/bubbles.lua urlfs https://pastebin.com/raw/JCR8YTww packages/screenSaver/savers/bubbles.lua urlfs https://pastebin.com/raw/JCR8YTww
packages/screenSaver/savers/fire.lua urlfs https://pastebin.com/raw/4CY4AYj3 #packages/screenSaver/savers/fire.lua urlfs https://pastebin.com/raw/4CY4AYj3
packages/screenSaver/savers/rain.lua urlfs https://pastebin.com/raw/P86Hm99N packages/screenSaver/savers/rain.lua urlfs https://pastebin.com/raw/P86Hm99N
packages/screenSaver/savers/snow.lua urlfs https://pastebin.com/raw/j1dwdLKw packages/screenSaver/savers/snow.lua urlfs https://pastebin.com/raw/j1dwdLKw
packages/screenSaver/savers/fireworks.lua urlfs https://pastebin.com/raw/Yn5sWt3f packages/screenSaver/savers/fireworks.lua urlfs https://pastebin.com/raw/Yn5sWt3f
packages/screenSaver/savers/starfield.lua urlfs https://pastebin.com/raw/AQm9R6nT packages/screenSaver/savers/starfield.lua urlfs https://pastebin.com/raw/AQm9R6nT
packages/screenSaver/savers/nyan.lua urlfs https://pastebin.com/raw/YJnT6Adu #packages/screenSaver/savers/nyan.lua urlfs https://pastebin.com/raw/YJnT6Adu
packages/screenSaver/savers/bounce.lua urlfs https://pastebin.com/raw/WLrfdyNy packages/screenSaver/savers/bounce.lua urlfs https://pastebin.com/raw/WLrfdyNy
packages/screenSaver/savers/antfarm.lua urlfs https://pastebin.com/raw/h9x3h7aw packages/screenSaver/savers/antfarm.lua urlfs https://pastebin.com/raw/h9x3h7aw