From a7251f8db451dcf3797c3f861ad7c578142365cd Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Thu, 19 Mar 2020 04:22:18 -0700
Subject: [PATCH] Recalculate the max window size when getting max size (#2988)

Fixes #2900
---
 .../shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java | 4 ++++
 .../shared/org/mozilla/vrbrowser/ui/widgets/Windows.java      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 4fe714689..fb3c6ae60 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
@@ -1295,6 +1295,10 @@ public void setMaxWindowScale(float aScale) {
     }
 
     public float getMaxWindowScale() {
+        Windows windows = mWidgetManager.getWindows();
+        if (windows != null) {
+            windows.updateMaxWindowScales();
+        }
         return mMaxWindowScale;
     }
 
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 06cc74768..6f320ef4b 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
@@ -608,7 +608,7 @@ public boolean handleBack() {
         return false;
     }
 
-    private void updateMaxWindowScales() {
+    void updateMaxWindowScales() {
         float maxScale = 3;
         if (mFullscreenWindow == null && getCurrentWindows().size() >= 3) {
             maxScale = 1.5f;