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

Restrict top tiling check to macOS 15.1 #1488

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Restrict top tiling check to macOS 15.1 #1488

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
7 changes: 5 additions & 2 deletions Rectangle/Utilities/MacTilingDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ enum MacTilingDefaults: String {

let isStandardTilingConflicting = (tilingByEdgeDrag.enabled || tilingOptionAccelerator.enabled)

let isTopTilingConflicting = topTilingByEdgeDrag.enabled && SnapAreaModel.instance.isTopConfigured

let shouldSkipStandardCheck = skipIfAlreadyNotified && Defaults.internalTilingNotified.enabled

if isStandardTilingConflicting && !shouldSkipStandardCheck {
Expand Down Expand Up @@ -76,6 +74,11 @@ enum MacTilingDefaults: String {
}
}

private static var isTopTilingConflicting: Bool {
guard #available(macOS 15.1, *) else { return false }
return topTilingByEdgeDrag.enabled && SnapAreaModel.instance.isTopConfigured
}

private static func resolveStandardTilingConflict() {
let result = AlertUtil.threeButtonAlert(
question: "Conflict with macOS tiling".localized,
Expand Down
Loading