From 2667446b82846e279c01628c5383109cfc4221de Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Fri, 15 Nov 2019 16:27:19 +0100 Subject: [PATCH 1/2] Deactivate current session when receiving a new tab --- .../shared/org/mozilla/vrbrowser/ui/widgets/Windows.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java index d57bf0afa..5bc85fb8d 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java @@ -1245,6 +1245,11 @@ public void onTabsClose(ArrayList aTabs) { @Override public void onTabsReceived(@NotNull List aTabs) { WindowWidget targetWindow = mFocusedWindow; + + if (!aTabs.isEmpty()) { + targetWindow.getSession().setActive(false); + } + boolean fullscreen = targetWindow.getSession().isInFullScreen(); for (int i = aTabs.size() - 1; i >= 0; --i) { Session session = SessionStore.get().createSession(targetWindow.getSession().isPrivateMode()); From a179eea6fc729e5915717f5c3215c5d75789bde8 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Mon, 18 Nov 2019 22:57:09 +0100 Subject: [PATCH 2/2] deactivate the previous session if not in fullscreen --- .../shared/org/mozilla/vrbrowser/ui/widgets/Windows.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java index 5bc85fb8d..88af276be 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java @@ -1246,10 +1246,6 @@ public void onTabsClose(ArrayList aTabs) { public void onTabsReceived(@NotNull List aTabs) { WindowWidget targetWindow = mFocusedWindow; - if (!aTabs.isEmpty()) { - targetWindow.getSession().setActive(false); - } - boolean fullscreen = targetWindow.getSession().isInFullScreen(); for (int i = aTabs.size() - 1; i >= 0; --i) { Session session = SessionStore.get().createSession(targetWindow.getSession().isPrivateMode()); @@ -1262,6 +1258,7 @@ public void onTabsReceived(@NotNull List aTabs) { if (i == 0 && !fullscreen) { // Set the first received tab of the list the current one. SessionStore.get().setActiveSession(session); + targetWindow.getSession().setActive(false); targetWindow.setSession(session); } }