Skip to content

Commit

Permalink
Merge pull request #1488 from strategiconquest/top-tiling-macos15.1-only
Browse files Browse the repository at this point in the history
Restrict top tiling check to macOS 15.1
  • Loading branch information
rxhanson authored Oct 14, 2024
2 parents 919f0be + 33a172f commit eee0492
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Rectangle/Utilities/MacTilingDefaults.swift
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

0 comments on commit eee0492

Please sign in to comment.