From 0fadf9a8ebf87ad250648334bc028e0413886819 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Tue, 27 Aug 2019 14:14:30 +0200
Subject: [PATCH] Fixes private mode and bookmarks dimming issues

---
 .../mozilla/vrbrowser/ui/widgets/WindowWidget.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
index 7220f48c0..2a80af53f 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -96,6 +96,7 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
     boolean mActive = false;
     boolean mHovered = false;
     boolean mClickedAfterFocus = false;
+    boolean mIsBookmarksVisible = false;
 
     public interface WindowDelegate {
         void onFocusRequest(@NonNull WindowWidget aWindow);
@@ -281,11 +282,13 @@ public void switchBookmarks() {
             setView(mBookmarksView);
             for (BookmarkListener listener : mBookmarksListeners)
                 listener.onBookmarksShown(this);
+            mIsBookmarksVisible = true;
 
         } else {
             unsetView(mBookmarksView);
             for (BookmarkListener listener : mBookmarksListeners)
                 listener.onBookmarksHidden(this);
+            mIsBookmarksVisible = false;
         }
 
         updateTitleBar();
@@ -684,6 +687,17 @@ public void setVisible(boolean aVisible) {
             return;
         }
         mWidgetPlacement.visible = aVisible;
+        if (!aVisible) {
+            if (mIsBookmarksVisible) {
+                mWidgetManager.popWorldBrightness(this);
+            }
+
+        } else {
+            if (mIsBookmarksVisible) {
+                mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);
+            }
+        }
+        mIsBookmarksVisible = isBookmarksVisible();
         mWidgetManager.updateWidget(this);
         if (!aVisible) {
             clearFocus();