From fa52ca1467e7b795fd6eaa8387bb99fd731956a5 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 24 Jun 2020 21:09:01 +0200
Subject: [PATCH] Grey out window when resizing (#3525)

---
 .../mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java  | 7 ++++++-
 .../org/mozilla/vrbrowser/ui/widgets/WindowWidget.java     | 7 +++----
 .../shared/org/mozilla/vrbrowser/ui/widgets/Windows.java   | 3 +++
 3 files changed, 12 insertions(+), 5 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
index 43dc54657..237615055 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -703,6 +703,7 @@ private void enterResizeMode() {
         if (mAttachedWindow.isResizing()) {
             return;
         }
+        mAttachedWindow.mWidgetPlacement.tintColor = Windows.GRAY;
         mAttachedWindow.setIsResizing(true);
         mAttachedWindow.saveBeforeResizePlacement();
         startWidgetResize();
@@ -746,6 +747,8 @@ private void enterResizeMode() {
             }
         }
 
+        mWidgetManager.updateWidget(mAttachedWindow);
+
         // Update preset styles
     }
 
@@ -760,7 +763,6 @@ private void exitResizeMode(ResizeAction aResizeAction) {
         }
         if (aResizeAction == ResizeAction.RESTORE_SIZE) {
             mAttachedWindow.restoreBeforeResizePlacement();
-            mWidgetManager.updateWidget(mAttachedWindow);
             mWidgetManager.updateVisibleWidgets();
         }
         mAttachedWindow.setIsResizing(false);
@@ -779,6 +781,9 @@ private void exitResizeMode(ResizeAction aResizeAction) {
             TelemetryWrapper.windowsResizeEvent();
             GleanMetricsService.windowsResizeEvent();
         }
+
+        mAttachedWindow.mWidgetPlacement.tintColor = Windows.WHITE;
+        mWidgetManager.updateWidget(mAttachedWindow);
     }
 
     private void enterVRVideo(@VideoProjectionMenuWidget.VideoProjectionFlags int aProjection) {
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
index 561e19baa..18536a8e1 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -104,7 +104,6 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
     private int mWidth;
     private int mHeight;
     private int mHandle;
-    private WidgetPlacement mWidgetPlacement;
     private TopBarWidget mTopBar;
     private TitleBarWidget mTitleBar;
     private WidgetManagerDelegate mWidgetManager;
@@ -1578,8 +1577,8 @@ private void hideContextMenus() {
             mSelectionMenu = null;
         }
 
-        if (mWidgetPlacement.tintColor != 0xFFFFFFFF) {
-            mWidgetPlacement.tintColor = 0xFFFFFFFF;
+        if (mWidgetPlacement.tintColor != Windows.WHITE) {
+            mWidgetPlacement.tintColor = Windows.WHITE;
             mWidgetManager.updateWidget(this);
         }
     }
@@ -1662,7 +1661,7 @@ public void onContextMenu(GeckoSession session, int screenX, int screenY, Contex
         }
         mContextMenu.show(REQUEST_FOCUS);
 
-        mWidgetPlacement.tintColor = 0x555555FF;
+        mWidgetPlacement.tintColor = Windows.GRAY;
         mWidgetManager.updateWidget(this);
     }
 
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 a12d6f90c..9e44b3f6e 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
@@ -56,6 +56,9 @@ public class Windows implements TrayListener, TopBarWidget.Delegate, TitleBarWid
 
     private static final String LOGTAG = SystemUtils.createLogtag(Windows.class);
 
+    public static final int WHITE = 0xFFFFFFFF;
+    public static final int GRAY = 0x555555FF;
+
     @IntDef(value = { OPEN_IN_FOREGROUND, OPEN_IN_BACKGROUND, OPEN_IN_NEW_WINDOW})
     public @interface NewTabLocation {}
     public static final int OPEN_IN_FOREGROUND = 0;