fix: Do not activate app when calling focus on inactive panel window (#40307)
* fix: Do not activate app when calling focus on inactive panel window * Use activate * Use "activate" for all windows
This commit is contained in:
parent
7999ea39e2
commit
b55d7f4a16
2 changed files with 48 additions and 1 deletions
|
@ -469,7 +469,20 @@ void NativeWindowMac::Focus(bool focus) {
|
|||
return;
|
||||
|
||||
if (focus) {
|
||||
[[NSApplication sharedApplication] activateIgnoringOtherApps:NO];
|
||||
// On macOS < Sonoma, "activateIgnoringOtherApps:NO" would not
|
||||
// activate apps if focusing a window that is inActive. That
|
||||
// changed with macOS Sonoma.
|
||||
//
|
||||
// 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];
|
||||
}
|
||||
|
||||
[window_ makeKeyAndOrderFront:nil];
|
||||
} else {
|
||||
[window_ orderOut:nil];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue