Hide the hamburger menu when switching windows. (#3823)

MozillaReality · Aug 18, 2020 · 2d8de16 · 2d8de16
1 parent 3afa6fa
commit 2d8de16
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -496,6 +496,7 @@ public void removeNavigationBarListener(@Nullable NavigationListener listener) {
 
     @Override
     public void detachFromWindow() {
+        hideMenu();
         hideAllNotifications();
 
         if (mAttachedWindow != null && mAttachedWindow.isResizing()) {
@@ -629,6 +630,7 @@ protected void onDraw(Canvas canvas) {
     }
 
     private void enterFullScreenMode() {
+        hideMenu();
         hideAllNotifications();
 
         mWidgetManager.pushBackHandler(mFullScreenBackHandler);
@@ -665,6 +667,7 @@ private void enterFullScreenMode() {
     }
 
     private void exitFullScreenMode() {
+        hideMenu();
         hideAllNotifications();
 
         if (mAttachedWindow == null || !mAttachedWindow.isFullScreen()) {
@@ -695,6 +698,7 @@ private void exitFullScreenMode() {
     }
 
     private void enterResizeMode() {
+        hideMenu();
         hideAllNotifications();
 
         if (mAttachedWindow.isResizing()) {
@@ -1209,7 +1213,7 @@ public void onAddons() {
 
     private void hideMenu() {
         if (mHamburgerMenu != null) {
-            mHamburgerMenu.hide(UIWidget.REMOVE_WIDGET);
+            mHamburgerMenu.hide(UIWidget.REMOVE_WIDGET, false);
         }
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java
@@ -113,7 +113,17 @@ public void show(int aShowFlags) {
 
     @Override
     public void hide(int aHideFlags) {
-        AnimationHelper.scaleOut(findViewById(R.id.menuContainer), 100, 0, () -> HamburgerMenuWidget.super.hide(aHideFlags));
+        hide(aHideFlags, true);
+    }
+
+    public void hide(int aHideFlags, boolean anim) {
+        if (anim) {
+            AnimationHelper.scaleOut(findViewById(R.id.menuContainer), 100, 0, () -> HamburgerMenuWidget.super.hide(aHideFlags));
+
+        } else {
+            HamburgerMenuWidget.super.hide(aHideFlags);
+        }
+
         mWidgetPlacement.proxifyLayer = false;
 
         if (mWidgetManager != null) {