Fix crash on popup window display; adjust naming (#2315)

Task/Issue URL: https://app.asana.com/0/1177771139624306/1206762780611864/f Description: fixes missing constraint ref
duckduckgo · Mar 5, 2024 · 555dcd0 · 555dcd0
1 parent 6534946
commit 555dcd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/DuckDuckGo/MainWindow/MainView.swift b/DuckDuckGo/MainWindow/MainView.swift
@@ -30,7 +30,6 @@ final class MainView: NSView {
     let divider = ColorView(frame: .zero, backgroundColor: .separatorColor)
 
     private(set) var navigationBarTopConstraint: NSLayoutConstraint!
-    private(set) var addressBarHeightConstraint: NSLayoutConstraint!
     private(set) var bookmarksBarHeightConstraint: NSLayoutConstraint!
 
     @Published var isMouseAboveWebView: Bool = false

diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -129,13 +129,15 @@ final class MainViewController: NSViewController {
             tabBarViewController.view.isHidden = true
             mainView.tabBarContainerView.isHidden = true
             mainView.navigationBarTopConstraint.constant = 0.0
-            mainView.addressBarHeightConstraint.constant = mainView.tabBarContainerView.frame.height
+            resizeNavigationBar(isHomePage: false, animated: false)
+
             updateBookmarksBarViewVisibility(visible: false)
         } else {
             mainView.navigationBarContainerView.wantsLayer = true
             mainView.navigationBarContainerView.layer?.masksToBounds = false
 
-            resizeNavigationBarForHomePage(tabCollectionViewModel.selectedTabViewModel?.tab.content == .newtab, animated: false)
+            resizeNavigationBar(isHomePage: tabCollectionViewModel.selectedTabViewModel?.tab.content == .newtab,
+                                animated: false)
 
             let bookmarksBarVisible = AppearancePreferences.shared.showBookmarksBar
             updateBookmarksBarViewVisibility(visible: bookmarksBarVisible)
@@ -291,7 +293,7 @@ final class MainViewController: NSViewController {
             }
     }
 
-    private func resizeNavigationBarForHomePage(_ homePage: Bool, animated: Bool) {
+    private func resizeNavigationBar(isHomePage homePage: Bool, animated: Bool) {
         updateDividerColor(isShowingHomePage: homePage)
         navigationBarViewController.resizeAddressBar(for: homePage ? .homePage : (isInPopUpWindow ? .popUpWindow : .default), animated: animated)
     }
@@ -303,7 +305,7 @@ final class MainViewController: NSViewController {
                 guard let self, let selectedTabViewModel else { return }
                 defer { lastTabContent = content }
 
-                resizeNavigationBarForHomePage(content == .newtab, animated: content == .newtab && lastTabContent != .newtab)
+                resizeNavigationBar(isHomePage: content == .newtab, animated: content == .newtab && lastTabContent != .newtab)
                 updateBookmarksBar(content)
                 adjustFirstResponder(selectedTabViewModel: selectedTabViewModel, tabContent: content)
             }