Skip to content

🐞 Fix window snapping on multi-display setups #479

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 1 commit into from
Jun 28, 2024
Merged

🐞 Fix window snapping on multi-display setups #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions Loop/Managers/WindowDragManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,7 @@ class WindowDragManager {
}

private func setCurrentDraggingWindow() {
guard let screen = NSScreen.screenWithMouse else {
return
}

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

do {
guard
Expand Down Expand Up @@ -131,19 +127,23 @@ class WindowDragManager {
guard let screen = NSScreen.screenWithMouse else {
return
}
let mousePosition = NSEvent.mouseLocation.flipY(maxY: screen.frame.maxY)
let screenFrame = screen.frame.flipY(maxY: screen.frame.maxY)

let mainScreen = NSScreen.screens[0]
let mousePosition = NSEvent.mouseLocation.flipY(screen: mainScreen)
let screenFrame = screen.frame.flipY(screen: mainScreen)

previewController.setScreen(to: screen)

let insets: CGFloat = 2
let topInset = screen.menubarHeight / 2
let inset: CGFloat = 2
let topInset = max(screen.menubarHeight / 2, inset)
var ignoredFrame = screenFrame

ignoredFrame.origin.x += insets
ignoredFrame.size.width -= insets * 2
ignoredFrame.origin.x += inset
ignoredFrame.size.width -= inset * 2
ignoredFrame.origin.y += topInset
ignoredFrame.size.height -= insets + topInset
ignoredFrame.size.height -= inset + topInset

print(ignoredFrame.minY, screenFrame.minY)

let oldDirection = direction

Expand Down