Merge pull request #1153 from mozilla/sleroux/Bug1209083-TabGrayFlicker

Bug 1209083 - Hide webViewContainer backdrop during tray transition, r=fluffyemily
mozilla-mobile · Oct 14, 2015 · 9c8d267 · 9c8d267
2 parents a2d2c57 + a2ae4e4
commit 9c8d267
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Client/Frontend/Browser/BrowserTrayAnimators.swift b/Client/Frontend/Browser/BrowserTrayAnimators.swift
@@ -41,6 +41,7 @@ private extension TrayToBrowserAnimator {
         bvc.toggleSnackBarVisibility(show: false)
         toggleWebViewVisibility(show: false, usingTabManager: bvc.tabManager)
         bvc.homePanelController?.view.hidden = true
+        bvc.webViewContainerBackdrop.hidden = true
 
         // Take a snapshot of the collection view that we can scale/fade out. We don't need to wait for screen updates since it's already rendered on the screen
         let tabCollectionViewSnapshot = tabTray.collectionView.snapshotViewAfterScreenUpdates(false)
@@ -100,6 +101,7 @@ private extension TrayToBrowserAnimator {
             bvc.startTrackingAccessibilityStatus()
             bvc.toggleSnackBarVisibility(show: true)
             toggleWebViewVisibility(show: true, usingTabManager: bvc.tabManager)
+            bvc.webViewContainerBackdrop.hidden = false
             bvc.homePanelController?.view.hidden = false
             bvc.urlBar.isTransitioning = false
             transitionContext.completeTransition(true)

diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -73,7 +73,7 @@ class BrowserViewController: UIViewController {
     private var topTouchArea: UIButton!
 
     // Backdrop used for displaying greyed background for private tabs
-    private var webViewContainerBackdrop: UIView!
+    var webViewContainerBackdrop: UIView!
 
     private var scrollController = BrowserScrollingController()