Fix #8547: Page zoom freeze (#8570)

Fix autolayout issue Co-authored-by: Brandon T <[email protected]>
brave · Dec 15, 2023 · fd6b34b · fd6b34b
1 parent aceefcd
commit fd6b34b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1529,7 +1529,7 @@ public class BrowserViewController: UIViewController {
       toolbar?.line.isHidden = isUsingBottomBar
     }
 
-    header.expandedBarStackView.removeArrangedSubview(tabsBar.view)
+    tabsBar.view.removeFromSuperview()
     if isUsingBottomBar {
       header.expandedBarStackView.insertArrangedSubview(tabsBar.view, at: 0)
     } else {
@@ -2297,11 +2297,6 @@ public class BrowserViewController: UIViewController {
   func displayPageZoom(visible: Bool) {
     if !visible || pageZoomBar != nil {
       pageZoomBar?.view.removeFromSuperview()
-
-      if let zoomBarView = pageZoomBar?.view {
-        alertStackView.removeArrangedSubview(zoomBarView)
-      }
-
       updateViewConstraints()
       pageZoomBar = nil
 
@@ -2335,6 +2330,7 @@ public class BrowserViewController: UIViewController {
 
     pageZoomBar.view.snp.makeConstraints { make in
       make.height.greaterThanOrEqualTo(UIConstants.toolbarHeight)
+      make.height.equalTo(UIConstants.toolbarHeight).priority(.high)
       make.edges.equalTo(alertStackView)
     }
 

diff --git a/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift b/Sources/Brave/Frontend/Browser/PageZoom/PageZoomView.swift
@@ -126,6 +126,7 @@ struct PageZoomView: View {
       HStack(spacing: 0.0) {
         Text(Strings.PageZoom.zoomViewText)
           .font(.system(.subheadline))
+          .fixedSize(horizontal: false, vertical: true)
           .frame(maxWidth: .infinity, alignment: .leading)
 
         ZoomView(
@@ -151,6 +152,7 @@ struct PageZoomView: View {
       .padding(.vertical, 6.0)
     }
     .background(Color(UIColor.braveBackground))
+    .ignoresSafeArea()
   }
 
   private func storeChanges() {