Skip to content

🐞 Use screen.displayBounds instead of screen.frame #850

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
Oct 19, 2025
+9 −7
Merged

🐞 Use screen.displayBounds instead of screen.frame #850

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4056b4
🐞 Use `screen.displayBounds` instead of `screen.frame`
mrkai77 Oct 18, 2025
3f133e3
Merge branch 'develop' into 835-window-jump-when-dragging-on-the-seco…
mrkai77 Oct 19, 2025
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
16 changes: 9 additions & 7 deletions Loop/Core/WindowDragManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ class WindowDragManager {
private var leftMouseDraggedMonitor: EventMonitor?
private var leftMouseUpMonitor: EventMonitor?

private var currentMousePosition: CGPoint {
NSEvent.mouseLocation.flipY(screen: NSScreen.screens[0])
}

func addObservers() {
leftMouseDraggedMonitor = NSEventMonitor(scope: .all, eventMask: .leftMouseDragged) { event in
// Process window (only ONCE during a window drag)
Expand Down Expand Up @@ -75,11 +79,9 @@ class WindowDragManager {
}

private func setCurrentDraggingWindow() {
let mousePosition = NSEvent.mouseLocation.flipY(screen: NSScreen.screens[0])

do {
guard
let draggingWindow = try WindowUtility.windowAtPosition(mousePosition),
let draggingWindow = try WindowUtility.windowAtPosition(currentMousePosition),
!draggingWindow.isAppExcluded
else {
return
Expand Down Expand Up @@ -109,22 +111,22 @@ class WindowDragManager {
if let screen = NSScreen.screenWithMouse {
var newWindowFrame = window.frame
newWindowFrame.size = initialFrame.size
newWindowFrame = newWindowFrame.pushInside(screen.frame)
newWindowFrame = newWindowFrame.pushInside(screen.displayBounds)
window.setFrame(newWindowFrame)
} else {
window.size = initialFrame.size
}

// If the window doesn't contain the cursor, keep the original maxX
if let cursorLocation = CGEvent.mouseLocation, !window.frame.contains(cursorLocation) {
if !window.frame.contains(currentMousePosition) {
var newFrame = window.frame

newFrame.origin.x = startFrame.maxX - newFrame.width
window.setFrame(newFrame)

// If it still doesn't contain the cursor, move the window to be centered with the cursor
if !newFrame.contains(cursorLocation) {
newFrame.origin.x = cursorLocation.x - (newFrame.width / 2)
if !newFrame.contains(currentMousePosition) {
newFrame.origin.x = currentMousePosition.x - (newFrame.width / 2)
window.setFrame(newFrame)
}
}
Expand Down