From 6aeaf883648cdec7cbe924b32dc703d6fef5d6d2 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 5 Feb 2020 01:34:47 +0100
Subject: [PATCH] Hide top bar when not in private mode and is single window
 (#2736)

---
 .../vrbrowser/ui/viewmodel/WindowViewModel.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/WindowViewModel.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/WindowViewModel.java
index 59d096238..87a0a3fe0 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/WindowViewModel.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/WindowViewModel.java
@@ -163,14 +163,16 @@ public WindowViewModel(Application application) {
     private Observer<ObservableBoolean> mIsTopBarVisibleObserver = new Observer<ObservableBoolean>() {
         @Override
         public void onChanged(ObservableBoolean o) {
-            if (isFullscreen.getValue().get() || isResizeMode.getValue().get()) {
+            if (isFullscreen.getValue().get() || isResizeMode.getValue().get() || !isWindowVisible.getValue().get()) {
                 isTopBarVisible.setValue(new ObservableBoolean(false));
 
-            } else if (isPrivateSession.getValue().get() && isOnlyWindow.getValue().get()) {
-                isTopBarVisible.setValue(new ObservableBoolean(true));
-
             } else {
-                isTopBarVisible.setValue(new ObservableBoolean(isWindowVisible.getValue().get() && !isOnlyWindow.getValue().get()));
+                if (isOnlyWindow.getValue().get()) {
+                    isTopBarVisible.setValue(new ObservableBoolean(isPrivateSession.getValue().get()));
+
+                } else {
+                    isTopBarVisible.setValue(new ObservableBoolean(true));
+                }
             }
         }
     };