Skip to content

✨ Improve WindowEngine by keeping track and cancelling the detached Task #1013

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

Merged
mrkai77 merged 2 commits into from
Jan 21, 2026
+8 −1
Merged

✨ Improve WindowEngine by keeping track and cancelling the detached Task #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99aeb56
Improve `WindowEngine` by keeping track and cancelling the detached Task
zenangst Jan 21, 2026
92e51c8
Format code
mrkai77 Jan 21, 2026
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
8 changes: 7 additions & 1 deletion Loop/Window Management/Window Manipulation/WindowEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import SwiftUI

/// Handles execution of `WindowAction`s on windows within the user's workspace
enum WindowEngine {
static var currentTask: Task<(), any Error>?
/// Resize a Window
/// - Parameters:
/// - window: Window to be resized
Expand All @@ -23,13 +24,16 @@ enum WindowEngine {
on screen: NSScreen,
completion: @escaping () -> () = {}
) {
Task.detached(priority: .userInitiated) {
currentTask?.cancel()
currentTask = Task.detached(priority: .userInitiated) {
await resize(
window,
to: action,
on: screen
)

try Task.checkCancellation()

completion()
}
}
Expand Down Expand Up @@ -222,10 +226,12 @@ enum WindowEngine {
try await window.setFrameAnimated(targetFrame, bounds: bounds)
} else {
window.setFrame(targetFrame, sizeFirst: willChangeScreens)
try Task.checkCancellation()
}

if !animate, !window.frame.approximatelyEqual(to: targetFrame) {
window.setFrame(targetFrame)
try Task.checkCancellation()
}

handleSizeConstrainedWindow(window: window, bounds: bounds)
Expand Down
1 change: 1 addition & 0 deletions Loop/Window Management/Window/Window.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ final class Window {

try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<(), Error>) in
Task {
try Task.checkCancellation()
let animation = WindowTransformAnimation(
rect,
window: self,
Expand Down