diff --git a/hammerspoon/ext/grid.lua b/hammerspoon/ext/grid.lua index 4541f01..37f1ee9 100644 --- a/hammerspoon/ext/grid.lua +++ b/hammerspoon/ext/grid.lua @@ -320,9 +320,7 @@ function grid.set(win, cell, scr) h = cell.h * cellh - (margins.h * 2), } - -- calculate proper margins - this fixes doubled margins betweeen windows - -- shamelessly borrowed from: - -- https://github.com/szymonkaliski/Dotfiles/blob/8f2bbf973fa31e001e183de03b65fae408877f00/Dotfiles/hammerspoon/overrides.lua#L79-L106 + -- ensure windows are not spaced by a double margin if cell.h < screengrid.h and cell.h % 1 == 0 then if cell.y ~= 0 then newframe.h = newframe.h + margins.h / 2 diff --git a/hammerspoon/ext/grid.lua.patch b/hammerspoon/ext/grid.lua.patch deleted file mode 100644 index e2c0ca5..0000000 --- a/hammerspoon/ext/grid.lua.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ext/grid.lua 2017-08-05 01:44:03.000000000 +0100 -+++ ext/grid.patched.lua 2017-08-05 01:43:43.000000000 +0100 -@@ -319,6 +319,32 @@ function grid.set(win, cell, scr) - w = cell.w * cellw - (margins.w * 2), - h = cell.h * cellh - (margins.h * 2), - } -+ -+ -- calculate proper margins - this fixes doubled margins betweeen windows -+ -- shamelessly borrowed from: -+ -- https://github.com/szymonkaliski/Dotfiles/blob/8f2bbf973fa31e001e183de03b65fae408877f00/Dotfiles/hammerspoon/overrides.lua#L79-L106 -+ if cell.h < screengrid.h and cell.h % 1 == 0 then -+ if cell.y ~= 0 then -+ newframe.h = newframe.h + margins.h / 2 -+ newframe.y = newframe.y - margins.h / 2 -+ end -+ -+ if cell.y + cell.h ~= screengrid.h then -+ newframe.h = newframe.h + margins.h / 2 -+ end -+ end -+ -+ if cell.w < screengrid.w and cell.w % 1 == 0 then -+ if cell.x ~= 0 then -+ newframe.w = newframe.w + margins.w / 2 -+ newframe.x = newframe.x - margins.w / 2 -+ end -+ -+ if cell.x + cell.w ~= screengrid.w then -+ newframe.w = newframe.w + margins.w / 2 -+ end -+ end -+ - win:setFrameInScreenBounds(newframe) --TODO check this (against screen bottom stickiness) - return grid - end