From 593569175c26830507a6ba42a2abce8c7ceeff1b Mon Sep 17 00:00:00 2001
From: Collin Donnell <collin@waveform.fm>
Date: Sat, 27 Feb 2021 16:32:57 -0800
Subject: [PATCH] Fix #2833: Titlebar is overlapped by toolbar in fullscreen

Fix issue where detail web view would be overlapped by the toolbar in full screen by setting web view constraints to use the `safeAreaLayoutGuide` in macOS 11+.
---
 .../Detail/DetailWebViewController.swift      | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift
index 7e71cfff1..89365f585 100644
--- a/Mac/MainWindow/Detail/DetailWebViewController.swift
+++ b/Mac/MainWindow/Detail/DetailWebViewController.swift
@@ -98,14 +98,25 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
 
 		box.addSubview(webView)
 
-		let constraints = [
-			webView.topAnchor.constraint(equalTo: view.topAnchor),
-			webView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-			webView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-			webView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-		]
+		// Use the safe area layout guides if they are available.
+		if #available(OSX 11.0, *) {
+			let constraints = [
+				webView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+				webView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor),
+				webView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+				webView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+			]
+			NSLayoutConstraint.activate(constraints)
+		} else {
+			let constraints = [
+				webView.topAnchor.constraint(equalTo: view.topAnchor),
+				webView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+				webView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+				webView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+			]
+			NSLayoutConstraint.activate(constraints)
+		}
 
-		NSLayoutConstraint.activate(constraints)
 
 		// Hide the web view until the first reload (navigation) is complete (plus some delay) to avoid the awful white flash that happens on the initial display in dark mode.
 		// See bug #901.