From a643320395bc5fe7db2d3cd78c6bcfd08f1ba4bf Mon Sep 17 00:00:00 2001
From: Chris Brind <brindy@duckduckgo.com>
Date: Mon, 11 Apr 2022 11:22:34 +0100
Subject: [PATCH] set the default height of the navigation bar so that it can
 be used when configuring a popup window

---
 DuckDuckGo/Main/View/Main.storyboard          | 9 +++++----
 DuckDuckGo/Main/View/MainViewController.swift | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/DuckDuckGo/Main/View/Main.storyboard b/DuckDuckGo/Main/View/Main.storyboard
index 617090ca0a..42ae4e699e 100644
--- a/DuckDuckGo/Main/View/Main.storyboard
+++ b/DuckDuckGo/Main/View/Main.storyboard
@@ -35,7 +35,7 @@
                                 </connections>
                             </containerView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="af1-Eb-VaG" userLabel="Separator" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="702" width="1024" height="1"/>
+                                <rect key="frame" x="0.0" y="708" width="1024" height="1"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="1" id="hrt-pu-NuL"/>
                                 </constraints>
@@ -46,16 +46,16 @@
                                 </userDefinedRuntimeAttributes>
                             </customView>
                             <containerView translatesAutoresizingMaskIntoConstraints="NO" id="wFH-xq-50o">
-                                <rect key="frame" x="0.0" y="703" width="1024" height="48"/>
+                                <rect key="frame" x="0.0" y="709" width="1024" height="42"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="48" id="vZS-tl-wOP"/>
+                                    <constraint firstAttribute="height" constant="42" id="vZS-tl-wOP"/>
                                 </constraints>
                                 <connections>
                                     <segue destination="R9l-dg-lKa" kind="embed" destinationCreationSelector="createNavigationBarViewControllerWithCoder:sender:segueIdentifier:" id="Br9-o3-sQ8"/>
                                 </connections>
                             </containerView>
                             <containerView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jbn-9T-FNt" userLabel="Find in Page Container View">
-                                <rect key="frame" x="312" y="667" width="400" height="40"/>
+                                <rect key="frame" x="312" y="673" width="400" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="Hzq-Qn-wpU"/>
                                     <constraint firstAttribute="width" constant="400" id="Ndt-bt-exS"/>
@@ -101,6 +101,7 @@
                         <outlet property="navigationBarTopConstraint" destination="TRm-AX-VcL" id="cCS-Fd-hJd"/>
                         <outlet property="tabBarContainerView" destination="lYg-bX-QrJ" id="nor-E0-cFP"/>
                         <outlet property="webContainerView" destination="SYo-8W-jl3" id="DoZ-Ih-dHA"/>
+                        <outlet property="webViewTopConstraint" destination="js0-Db-kRi" id="puD-Cr-Val"/>
                     </connections>
                 </viewController>
                 <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
diff --git a/DuckDuckGo/Main/View/MainViewController.swift b/DuckDuckGo/Main/View/MainViewController.swift
index d7a86a7bb3..e62b0bb371 100644
--- a/DuckDuckGo/Main/View/MainViewController.swift
+++ b/DuckDuckGo/Main/View/MainViewController.swift
@@ -29,6 +29,7 @@ final class MainViewController: NSViewController {
     @IBOutlet weak var findInPageContainerView: NSView!
     @IBOutlet var navigationBarTopConstraint: NSLayoutConstraint!
     @IBOutlet var addressBarHeightConstraint: NSLayoutConstraint!
+    @IBOutlet var webViewTopConstraint: NSLayoutConstraint!
 
     @IBOutlet var divider: NSView!
 
@@ -72,6 +73,7 @@ final class MainViewController: NSViewController {
             tabBarViewController.view.isHidden = true
             tabBarContainerView.isHidden = true
             navigationBarTopConstraint.constant = 0.0
+            webViewTopConstraint.constant = navigationBarViewController.view.frame.height
             addressBarHeightConstraint.constant = tabBarContainerView.frame.height
         } else {
             navigationBarContainerView.wantsLayer = true