Fixes private mode and bookmarks dimming issues (#1671)

MozillaReality · Aug 27, 2019 · 686fdbe · 686fdbe
1 parent 13c32ec
commit 686fdbe
Showing 1 changed file with 14 additions and 0 deletions.
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
@@ -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();