From 2328623d748af7fbe0053bd302c17b9b0ebc0790 Mon Sep 17 00:00:00 2001
From: Mate Tohai <admin@Tmate6.com>
Date: Thu, 9 May 2024 20:29:43 +0300
Subject: [PATCH] Add separate gap for notched display

---
 Rectangle/Defaults.swift        |  2 ++
 Rectangle/ScreenDetection.swift | 14 ++++++++++++--
 TerminalCommands.md             |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Rectangle/Defaults.swift b/Rectangle/Defaults.swift
index 414a7b8ce..1b22f4ce5 100644
--- a/Rectangle/Defaults.swift
+++ b/Rectangle/Defaults.swift
@@ -39,6 +39,7 @@ class Defaults {
     static let screenEdgeGapLeft = FloatDefault(key: "screenEdgeGapLeft", defaultValue: 0)
     static let screenEdgeGapRight = FloatDefault(key: "screenEdgeGapRight", defaultValue: 0)
     static let screenEdgeGapsOnMainScreenOnly = BoolDefault(key: "screenEdgeGapsOnMainScreenOnly")
+    static let screenEdgeGapTopNotch = FloatDefault(key: "screenEdgeGapTopNotch", defaultValue: 0)
     static let lastVersion = StringDefault(key: "lastVersion")
     static let showAllActionsInMenu = OptionalBoolDefault(key: "showAllActionsInMenu")
     static var SUHasLaunchedBefore: Bool { UserDefaults.standard.bool(forKey: "SUHasLaunchedBefore") }
@@ -118,6 +119,7 @@ class Defaults {
         screenEdgeGapLeft,
         screenEdgeGapRight,
         screenEdgeGapsOnMainScreenOnly,
+        screenEdgeGapTopNotch,
         showAllActionsInMenu,
         footprintAlpha,
         footprintBorderWidth,
diff --git a/Rectangle/ScreenDetection.swift b/Rectangle/ScreenDetection.swift
index a9cbcb3c9..4a246e3c2 100644
--- a/Rectangle/ScreenDetection.swift
+++ b/Rectangle/ScreenDetection.swift
@@ -156,8 +156,18 @@ extension NSScreen {
         newFrame.origin.x += Defaults.screenEdgeGapLeft.cgFloat
         newFrame.origin.y += Defaults.screenEdgeGapBottom.cgFloat
         newFrame.size.width -= (Defaults.screenEdgeGapLeft.cgFloat + Defaults.screenEdgeGapRight.cgFloat)
-        newFrame.size.height -= (Defaults.screenEdgeGapTop.cgFloat + Defaults.screenEdgeGapBottom.cgFloat)
-
+        
+        if #available(macOS 12.0, *) {
+            if self.safeAreaInsets.top > 0, Defaults.screenEdgeGapTopNotch.value != 0 {
+                newFrame.size.height -= (Defaults.screenEdgeGapTopNotch.cgFloat + Defaults.screenEdgeGapBottom.cgFloat)
+            } else {
+                newFrame.size.height -= (Defaults.screenEdgeGapTop.cgFloat + Defaults.screenEdgeGapBottom.cgFloat)
+            }
+            
+        } else {
+            newFrame.size.height -= (Defaults.screenEdgeGapTop.cgFloat + Defaults.screenEdgeGapBottom.cgFloat)
+        }
+        
         return newFrame
     }
 
diff --git a/TerminalCommands.md b/TerminalCommands.md
index fb1f52301..75d5f18d4 100644
--- a/TerminalCommands.md
+++ b/TerminalCommands.md
@@ -361,6 +361,12 @@ defaults write com.knollsoft.Rectangle screenEdgeGapLeft -int 10
 defaults write com.knollsoft.Rectangle screenEdgeGapRight -int 10
 ```
 
+You can also seperately specify the gap for a screen with a notch. Useful for multi display setups if you are using a menubar replacement.
+
+```bash
+defaults write com.knollsoft.Rectangle screenEdgeGapTopNotch -int 5
+```
+
 If you want these gaps to be applied on your main screen only you can set screenEdgeGapsOnMainScreenOnly. Useful for multi display setups where only one screen has some dock replacement.
 
 ```bash