Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
239 changes: 126 additions & 113 deletions Rectangle/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Rectangle/Defaults.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class Defaults {
static let resizeOnDirectionalMove = BoolDefault(key: "resizeOnDirectionalMove")
static let ignoredSnapAreas = IntDefault(key: "ignoredSnapAreas")
static let traverseSingleScreen = OptionalBoolDefault(key: "traverseSingleScreen")
static let useCursorScreenDetection = BoolDefault(key: "useCursorScreenDetection")
static let minimumWindowWidth = FloatDefault(key: "minimumWindowWidth")
static let minimumWindowHeight = FloatDefault(key: "minimumWindowHeight")
static let sizeOffset = FloatDefault(key: "sizeOffset")
Expand Down
12 changes: 10 additions & 2 deletions Rectangle/PrefsWindow/SettingsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class SettingsViewController: NSViewController {
@IBOutlet weak var gapSlider: NSSlider!
@IBOutlet weak var gapLabel: NSTextField!
@IBOutlet weak var cursorAcrossCheckbox: NSButton!
@IBOutlet weak var useCursorScreenDetectionCheckbox: NSButton!
@IBOutlet weak var doubleClickTitleBarCheckbox: NSButton!
@IBOutlet weak var todoCheckbox: NSButton!
@IBOutlet weak var todoView: NSStackView!
Expand Down Expand Up @@ -92,7 +93,12 @@ class SettingsViewController: NSViewController {
let newSetting: Bool = sender.state == .on
Defaults.moveCursorAcrossDisplays.enabled = newSetting
}


@IBAction func toggleUseCursorScreenDetection(_ sender: NSButton) {
let newSetting: Bool = sender.state == .on
Defaults.useCursorScreenDetection.enabled = newSetting
}

@IBAction func toggleAllowAnyShortcut(_ sender: NSButton) {
let newSetting: Bool = sender.state == .on
Defaults.allowAnyShortcut.enabled = newSetting
Expand Down Expand Up @@ -320,7 +326,9 @@ class SettingsViewController: NSViewController {
gapSlider.isContinuous = true

cursorAcrossCheckbox.state = Defaults.moveCursorAcrossDisplays.userEnabled ? .on : .off


useCursorScreenDetectionCheckbox.state = Defaults.useCursorScreenDetection.enabled ? .on : .off

doubleClickTitleBarCheckbox.state = WindowAction(rawValue: Defaults.doubleClickTitleBar.value - 1) != nil ? .on : .off

if StageUtil.stageCapable {
Expand Down
27 changes: 27 additions & 0 deletions Rectangle/ScreenDetection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,33 @@ class ScreenDetection {
return UsableScreens(currentScreen: sourceScreen, adjacentScreens: adjacentScreens, numScreens: screens.count, screensOrdered: screensOrdered)
}

func detectScreensAtCursor() -> UsableScreens? {
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Let's remove all of the comments in this function.

let screens = NSScreen.screens
guard let firstScreen = screens.first else { return nil }

if screens.count == 1 {
// Delegate to window-based detection for single screen
return detectScreens(using: nil)
}

let screensOrdered = order(screens: screens)

// Get cursor position
let mouseLocation = NSEvent.mouseLocation

// Find screen containing cursor
guard let cursorScreen = screens.first(where: { screen in
screen.frame.contains(mouseLocation)
}) else {
// Fallback to window-based detection if cursor screen not found
return detectScreens(using: nil)
}

let adjacentScreens = adjacent(toFrameOfScreen: cursorScreen.frame, screens: screensOrdered)

return UsableScreens(currentScreen: cursorScreen, adjacentScreens: adjacentScreens, numScreens: screens.count, screensOrdered: screensOrdered)
}

func screenContaining(_ rect: CGRect, screens: [NSScreen]) -> NSScreen? {
var result: NSScreen? = NSScreen.main
var largestPercentageOfRectWithinFrameOfScreen: CGFloat = 0.0
Expand Down
7 changes: 6 additions & 1 deletion Rectangle/WindowManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@ class WindowManager {
if let screen = parameters.screen {
screens = UsableScreens(currentScreen: screen, numScreens: 1)
} else {
screens = screenDetection.detectScreens(using: frontmostWindowElement)
// Use cursor position or window position based on user preference
if Defaults.useCursorScreenDetection.enabled {
screens = screenDetection.detectScreensAtCursor()
} else {
screens = screenDetection.detectScreens(using: frontmostWindowElement)
}
}

guard let usableScreens = screens else {
Expand Down
12 changes: 12 additions & 0 deletions Rectangle/mul.lproj/Main.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -12574,6 +12574,18 @@
}
}
},
"CUR-SD-CEL.title" : {
"comment" : "Class = \"NSButtonCell\"; title = \"Use cursor position for screen detection\"; ObjectID = \"CUR-SD-CEL\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Use cursor position for screen detection"
}
}
}
},
"Currently using: " : {
"localizations" : {
"ar" : {
Expand Down