apply scroll bar tweaking

duckduckgo · Jan 31, 2024 · 804e6dc · 804e6dc
1 parent 9edbfc9
commit 804e6dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -282,12 +282,16 @@ class MainViewController: UIViewController {
 
         tabManager.cleanupTabsFaviconCache()
 
+        // Needs to be called here to established correct view hierarchy
         refreshViewsBasedOnAddressBarPosition(appSettings.currentAddressBarPosition)
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
+        // Needs to be called here because sometimes the frames are not the expected size during didLoad
+        refreshViewsBasedOnAddressBarPosition(appSettings.currentAddressBarPosition)
+
         startOnboardingFlowIfNotSeenBefore()
         tabsBarController?.refresh(tabsModel: tabManager.model)
         swipeTabsCoordinator?.refresh(tabsModel: tabManager.model)

diff --git a/DuckDuckGo/SwipeTabsCoordinator.swift b/DuckDuckGo/SwipeTabsCoordinator.swift
@@ -293,11 +293,11 @@ extension SwipeTabsCoordinator {
 
     func addressBarPositionChanged(isTop: Bool) {
         if isTop {
-            collectionView.horizontalScrollIndicatorInsets.bottom = 50
+            collectionView.horizontalScrollIndicatorInsets.bottom = -2
             collectionView.hitTestInsets.top = -12
             collectionView.hitTestInsets.bottom = 0
         } else {
-            collectionView.horizontalScrollIndicatorInsets.bottom = -8
+            collectionView.horizontalScrollIndicatorInsets.bottom = collectionView.frame.height - 8
             collectionView.hitTestInsets.top = 0
             collectionView.hitTestInsets.bottom = -12
         }