Update tray when a window is closed (and focus didn't change) (#1723)

MozillaReality · Aug 30, 2019 · 9f84d3f · 9f84d3f
1 parent 376611a
commit 9f84d3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -270,6 +270,11 @@ public void onWindowBorderChanged(@NonNull WindowWidget aChangeWindow) {
             public void onWindowsMoved() {
                 updateWidget(mTray);
             }
+
+            @Override
+            public void onWindowClosed() {
+                updateWidget(mTray);
+            }
         });
 
         // Create Browser navigation widget

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
@@ -89,6 +89,7 @@ public interface Delegate {
         void onFocusedWindowChanged(@NonNull WindowWidget aFocusedWindow, @Nullable WindowWidget aPrevFocusedWindow);
         void onWindowBorderChanged(@NonNull WindowWidget aChangeWindow);
         void onWindowsMoved();
+        void onWindowClosed();
     }
 
     public Windows(Context aContext) {
@@ -276,6 +277,9 @@ public void closeWindow(@NonNull WindowWidget aWindow) {
         }
 
         updateViews();
+        if (mDelegate != null) {
+            mDelegate.onWindowClosed();
+        }
     }
 
     public void moveWindowRight(@NonNull WindowWidget aWindow) {