From c60b74b12cb8421fcfdfda684e6acde63f530efe Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Sat, 10 Jul 2021 05:38:25 +0900
Subject: [PATCH] fix: window ordering on mac (#29857)

---
 shell/browser/native_window_mac.mm   |  2 --
 spec-main/api-browser-window-spec.ts | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 29cba7eaa099c..bd810dbd87e19 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -1682,8 +1682,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::SetActive(bool is_key) {
-  if (is_key)
-    widget()->Activate();
   is_active_ = is_key;
 }
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index f297d4b32e17a..0a1863abf0d09 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4203,6 +4203,18 @@ describe('BrowserWindow module', () => {
         await leaveFullScreen;
         expect(w.isFullScreen()).to.be.false('isFullScreen');
       });
+
+      it('multiple windows inherit correct fullscreen state', async () => {
+        const w = new BrowserWindow();
+        const enterFullScreen = emittedOnce(w, 'enter-full-screen');
+        w.setFullScreen(true);
+        await enterFullScreen;
+        expect(w.isFullScreen()).to.be.true('isFullScreen');
+        await delay();
+        const w2 = new BrowserWindow();
+        await delay();
+        expect(w2.isFullScreen()).to.be.true('isFullScreen');
+      });
     });
 
     describe('closable state', () => {