Skip to content

Commit

Permalink
Added config for disabling the top snap area
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Hanson committed Feb 2, 2020
1 parent db3b2fe commit 390dfa2
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 19 deletions.
20 changes: 20 additions & 0 deletions Rectangle/Defaults.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Defaults {
static let almostMaximizeWidth = FloatDefault(key: "almostMaximizeWidth")
static let gapSize = FloatDefault(key: "gapSize")
static let centeredDirectionalMove = OptionalBoolDefault(key: "centeredDirectionalMove")
static let ignoredSnapAreas = IntDefault(key: "ignoredSnapAreas")
}

class BoolDefault {
Expand Down Expand Up @@ -108,3 +109,22 @@ class FloatDefault {
initialized = true
}
}

class IntDefault {
private let key: String
private var initialized = false

var value: Int {
didSet {
if initialized {
UserDefaults.standard.set(value, forKey: key)
}
}
}

init(key: String) {
self.key = key
value = UserDefaults.standard.integer(forKey: key)
initialized = true
}
}
54 changes: 35 additions & 19 deletions Rectangle/Snapping/SnappingManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ class SnappingManager {
var frontmostWindow: AccessibilityElement?
var windowMoving: Bool = false
var initialWindowRect: CGRect?
var currentHotSpot: HotSpot?
var currentHotSpot: SnapArea?

var box: NSWindow?

let screenDetection = ScreenDetection()

private let gapSize = Defaults.gapSize.value
private let ignoredSnapAreas = SnapAreaOption(rawValue: Defaults.ignoredSnapAreas.value)

init(windowCalculationFactory: WindowCalculationFactory, windowHistory: WindowHistory) {
self.windowCalculationFactory = windowCalculationFactory
Expand Down Expand Up @@ -183,7 +184,7 @@ class SnappingManager {
return box
}

func getBoxRect(hotSpot: HotSpot, currentWindow: Window) -> CGRect? {
func getBoxRect(hotSpot: SnapArea, currentWindow: Window) -> CGRect? {
if let calculation = windowCalculationFactory.calculation(for: hotSpot.action) {

let rectResult = calculation.calculateRect(currentWindow, lastAction: nil, visibleFrameOfScreen: hotSpot.screen.visibleFrame, action: hotSpot.action)
Expand All @@ -199,7 +200,7 @@ class SnappingManager {
return nil
}

func getMouseHotSpot(priorHotSpot: HotSpot?) -> HotSpot? {
func getMouseHotSpot(priorHotSpot: SnapArea?) -> SnapArea? {

for screen in NSScreen.screens {
let frame = screen.frame
Expand All @@ -208,54 +209,54 @@ class SnappingManager {
if loc.x >= frame.minX {
if loc.x < frame.minX + 25 {
if loc.y >= frame.maxY - 25 && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .topLeft)
return SnapArea(screen: screen, action: .topLeft)
}
if loc.y >= frame.minY && loc.y <= frame.minY + 25 {
return HotSpot(screen: screen, action: .bottomLeft)
return SnapArea(screen: screen, action: .bottomLeft)
}
}

if loc.x < frame.minX + 5 {
if loc.y >= frame.minY && loc.y <= frame.minY + 150 {
return HotSpot(screen: screen, action: .bottomHalf)
return SnapArea(screen: screen, action: .bottomHalf)
}
if loc.y >= frame.maxY - 150 && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .topHalf)
return SnapArea(screen: screen, action: .topHalf)
}
if loc.y >= frame.minY && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .leftHalf)
return SnapArea(screen: screen, action: .leftHalf)
}
}
}

if loc.x <= frame.maxX {
if loc.x > frame.maxX - 25 {
if loc.y >= frame.maxY - 25 && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .topRight)
return SnapArea(screen: screen, action: .topRight)
}
if loc.y >= frame.minY && loc.y <= frame.minY + 25 {
return HotSpot(screen: screen, action: .bottomRight)
return SnapArea(screen: screen, action: .bottomRight)
}
}


if loc.x > frame.maxX - 5 {
if loc.y >= frame.minY && loc.y <= frame.minY + 150 {
return HotSpot(screen: screen, action: .bottomHalf)
return SnapArea(screen: screen, action: .bottomHalf)
}
if loc.y >= frame.maxY - 150 && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .topHalf)
return SnapArea(screen: screen, action: .topHalf)
}
if loc.y >= frame.minY && loc.y <= frame.maxY {
return HotSpot(screen: screen, action: .rightHalf)
return SnapArea(screen: screen, action: .rightHalf)
}
}
}

if loc.y >= frame.minY && loc.y < frame.minY + 5 {
let thirdWidth = floor(frame.width / 3)
if loc.x >= frame.minX && loc.x <= frame.minX + thirdWidth {
return HotSpot(screen: screen, action: .firstThird)
return SnapArea(screen: screen, action: .firstThird)
}
if loc.x >= frame.minX + thirdWidth && loc.x <= frame.maxX - thirdWidth{
if let priorAction = priorHotSpot?.action {
Expand All @@ -267,18 +268,20 @@ class SnappingManager {
action = .lastTwoThirds
default: action = .centerThird
}
return HotSpot(screen: screen, action: action)
return SnapArea(screen: screen, action: action)
}
return HotSpot(screen: screen, action: .centerThird)
return SnapArea(screen: screen, action: .centerThird)
}
if loc.x >= frame.minX + thirdWidth && loc.x <= frame.maxX {
return HotSpot(screen: screen, action: .lastThird)
return SnapArea(screen: screen, action: .lastThird)
}
}

if loc.y <= frame.maxY && loc.y > frame.maxY - 5 {
if loc.x >= frame.minX && loc.x <= frame.maxX {
return HotSpot(screen: screen, action: .maximize)
if !ignoredSnapAreas.contains(.top) {
return SnapArea(screen: screen, action: .maximize)
}
}
}

Expand All @@ -289,11 +292,24 @@ class SnappingManager {

}

struct HotSpot: Equatable {
struct SnapArea: Equatable {
let screen: NSScreen
let action: WindowAction
}

struct SnapAreaOption: OptionSet {
let rawValue: Int

static let top = SnapAreaOption(rawValue: 1 << 0)
static let sides = SnapAreaOption(rawValue: 1 << 1)
static let sideEdges = SnapAreaOption(rawValue: 1 << 2)
static let corners = SnapAreaOption(rawValue: 1 << 3)
static let bottom = SnapAreaOption(rawValue: 1 << 4)

static let all: SnapAreaOption = [.top, .sides, .sideEdges, .corners, .bottom]
static let none: SnapAreaOption = []
}

// Updating the location first, followed by the size can reduce some jenkiness
// This leads to a smoother restore when dragging a previously snapped window
struct TwoStageResizeRect {
Expand Down

0 comments on commit 390dfa2

Please sign in to comment.