mirrors/ldd-CC
1
0
Fork 0
mirror of https://github.com/LDDestroier/CC/ synced 2024-12-13 11:40:28 +00:00
Code Issues Releases Wiki Activity

Update workspace.lua

Browse Source
This commit is contained in:
LDDestroier 2019-06-22 20:13:00 -04:00 committed by GitHub
parent 7ebd4524f5
commit 839987fb9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
workspace.lua
View File

@ -7,14 +7,14 @@ local instances = {}
local configPath = ".workspace_config" local configPath = ".workspace_config"
local config = { local config = {
workspaceMoveSpeed = 0.1, workspaceMoveSpeed = 0.15,
defaultProgram = "rom/programs/shell.lua", defaultProgram = "rom/programs/shell.lua",
timesRan = 0, timesRan = 0,
useDefaultProgramWhenStarting = true, useDefaultProgramWhenStarting = true,
doPauseClockAndTime = true, doPauseClockAndTime = true,
skipAcrossEmptyWorkspaces = true, skipAcrossEmptyWorkspaces = true,
showInactiveFrame = true, showInactiveFrame = true,
doTrippyVoid = true, doTrippyVoid = false,
WSmap = { WSmap = {
{true,true,true}, {true,true,true},
{true,true,true}, {true,true,true},
@ -126,7 +126,7 @@ local drawWorkspaceIndicator = function(terminal, wType)
if wType == 1 then if wType == 1 then
for y = gridMinY - 1, gridHeight + 1 do for y = gridMinY - 1, gridHeight + 1 do
for x = gridMinX - 1, gridWidth + 1 do for x = gridMinX - 1, gridWidth + 1 do
terminal.setCursorPos((x - gridMinX) + scr_x / 2 - (gridWidth - gridMinX) / 2, (y - gridMinY) + scr_y / 2 - (gridHeight - gridMinY) / 2) terminal.setCursorPos((x - gridMinX) + scr_x / 2 - (gridWidth - gridMinX) / 2, (y - gridMinY) + math.ceil(scr_y / 2) - (gridHeight - gridMinY) / 2)
if instances[y] then if instances[y] then
if instances[y][x] then if instances[y][x] then
if focus[1] == x and focus[2] == y then if focus[1] == x and focus[2] == y then
@ -865,7 +865,7 @@ local removeWorkspace = function(xmod, ymod)
if config.WSmap[focus[2] + ymod][focus[1] + xmod] then if config.WSmap[focus[2] + ymod][focus[1] + xmod] then
local good = false local good = false
for m = 1, math.max(gridHeight, gridWidth) do for m = 1, math.max(gridHeight - gridMinY + 1, gridWidth - gridMinX + 1) do
for y = -1, 1 do for y = -1, 1 do
for x = -1, 1 do for x = -1, 1 do
if math.abs(x) + math.abs(y) == 1 then if math.abs(x) + math.abs(y) == 1 then
@ -1215,7 +1215,7 @@ local main = function()
wID = os.startTimer(workspaceIndicatorDuration) wID = os.startTimer(workspaceIndicatorDuration)
keysDown[keys.q] = false keysDown[keys.q] = false
local good = false local good = false
for m = 1, math.max(gridHeight, gridWidth) do for m = 1, math.max(gridHeight - gridMinY + 1, gridWidth - gridMinX + 1) do
for y = -1, 1 do for y = -1, 1 do
for x = -1, 1 do for x = -1, 1 do
if math.abs(x) + math.abs(y) == 1 then if math.abs(x) + math.abs(y) == 1 then