From 220166419f1591f61712c6a9e93d552f444789c8 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 17:44:27 -0700 Subject: [PATCH] fix: restore non-panel focus behavior (#42187) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard --- shell/browser/native_window_mac.mm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index e6de321773d..19de8c55cd5 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -425,20 +425,7 @@ void NativeWindowMac::Focus(bool focus) { // If we're a panel window, we do not want to activate the app, // which enables Electron-apps to build Spotlight-like experiences. if (!IsPanel()) { - // On macOS < Sonoma, "activateIgnoringOtherApps:NO" would not - // activate apps if focusing a window that is inActive. That - // changed with macOS Sonoma, which also deprecated - // "activateIgnoringOtherApps". - // - // There's a slim chance we should have never called - // activateIgnoringOtherApps, but we tried that many years ago - // and saw weird focus bugs on other macOS versions. So, to make - // this safe, we're gating by versions. - if (@available(macOS 14.0, *)) { - [[NSApplication sharedApplication] activate]; - } else { - [[NSApplication sharedApplication] activateIgnoringOtherApps:NO]; - } + [[NSApplication sharedApplication] activateIgnoringOtherApps:NO]; } [window_ makeKeyAndOrderFront:nil]; } else {