Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: setWindowState when target_space is empty #2

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

fix: setWindowState when target_space is empty #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
640ea0f
add default and vscode ignore lists
shailesh17 Nov 3, 2024
3ddbaee
fix setWindowState when target_space is empty
shailesh17 Nov 3, 2024
9a8d18b
add else debug message when target_space is empty
shailesh17 Nov 3, 2024
0d742fe
chore: improve debug comment when state doesn't exist
shailesh17 Nov 3, 2024
f8c6b23
revert the changes to .gitignore
shailesh17 Nov 4, 2024
7d5d43e
fix debug comment when target_space not set
shailesh17 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions restore_spaces/rs/plumbing.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,19 +195,23 @@ return function(rs,hs)
else
target_space = space
end
--target_space = tonumber(target_space)
if target_space then
shailesh17 marked this conversation as resolved.
Show resolved Hide resolved
--target_space = tonumber(target_space)

if rs.spaces_fixed_after_macOS14_5 then
hs.spaces.moveWindowToSpace(window, target_space)
if rs.spaces_fixed_after_macOS14_5 then
hs.spaces.moveWindowToSpace(window, target_space)
else
-- solution by `cunha`
-- (see: https://github.com/Hammerspoon/hammerspoon/pull/3638#issuecomment-2252826567)
local target_screen, _ = hs.spaces.spaceDisplay(target_space)
hs.spaces.moveWindowToSpace(window, target_space)
window:focus()
rs.delayExecution(0.4)
window:moveToScreen(target_screen)
window:focus()
end
else
-- solution by `cunha`
-- (see: https://github.com/Hammerspoon/hammerspoon/pull/3638#issuecomment-2252826567)
local target_screen, _ = hs.spaces.spaceDisplay(target_space)
hs.spaces.moveWindowToSpace(window, target_space)
window:focus()
rs.delayExecution(0.4)
window:moveToScreen(target_screen)
window:focus()
rs.issueVerbose("target space undefined; unable to set window " .. window:id(), rs.verbose)
end

rs.setFrameState(window, frame_state, fullscreen_state)
Copy link
Owner

@tplobo tplobo Nov 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not comply with the modifications...
both setFrameState and issueVerbose("set window"...) should only be called if target_space was identified, so they should be moved into the if statement (or maybe using a return)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you're at it, can you also try to change the "target space undefined..." line to keep it under 72 characters?

In this code I have been using something like the following:

local msg = "target space undefined; "
msg = msg .. "unable to set window "
rs.issueVerbose(msg .. window:id(), rs.verbose)

Expand Down
2 changes: 1 addition & 1 deletion restore_spaces/rs/porcelain.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ return function(rs,hs)

rs.data_wins = rs.processDataInFile("read","windows")
if not rs.data_wins[env_name] then
error("State for environment has never been saved!")
error("State for environment [" .. env_name .. "] has never been saved!")
shailesh17 marked this conversation as resolved.
Show resolved Hide resolved
end
local env_state = rs.data_wins[env_name]

Expand Down