From 8bd41544eeff415daa09e404bf89b61cbc262a44 Mon Sep 17 00:00:00 2001
From: Ping <5123601+pingren@users.noreply.github.com>
Date: Tue, 2 Aug 2022 13:20:42 +0800
Subject: [PATCH] Fix isStandalone when PWA entering fullscreen (#156424)

Fixes https://github.com/microsoft/vscode/issues/156347
---
 src/vs/base/browser/browser.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 8191f523595..01db9eebc27 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -194,9 +194,16 @@ export const isAndroid = (userAgent.indexOf('Android') >= 0);
 
 let standalone = false;
 if (window.matchMedia) {
-	const matchMedia = window.matchMedia('(display-mode: standalone)');
-	standalone = matchMedia.matches;
-	addMatchMediaChangeListener(matchMedia, ({ matches }) => {
+	const standaloneMatchMedia = window.matchMedia('(display-mode: standalone)');
+	const fullScreenMatchMedia = window.matchMedia('(display-mode: fullscreen)');
+	standalone = standaloneMatchMedia.matches;
+	addMatchMediaChangeListener(standaloneMatchMedia, ({ matches }) => {
+		// entering fullscreen would change standaloneMatchMedia.matches to false
+		// if standalone is true (running as PWA) and entering fullscreen, skip this change
+		if (standalone && fullScreenMatchMedia.matches) {
+			return;
+		}
+		// otherwise update standalone (browser to PWA or PWA to browser)
 		standalone = matches;
 	});
 }