wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 07:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1491 - Part 2: Disable a workaround on macOS 10.14+ for an Apple bug described in Mozilla bug 378645 involving popup windows that was fixed by Apple.

Browse source
This commit is contained in:
Brian Smith 2020-03-21 17:39:53 -05:00 • committed by Roy Tam
commit 186c726563
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
widget/cocoa/nsCocoaWindow.mm
View file

@ -810,15 +810,17 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState)
} }
} }
else if (mWindowType == eWindowType_popup) { else if (mWindowType == eWindowType_popup) {
if (!nsCocoaFeatures::OnMojaveOrLater()) {
// If a popup window is shown after being hidden, it needs to be "reset" // If a popup window is shown after being hidden, it needs to be "reset"
// for it to receive any mouse events aside from mouse-moved events // for it to receive any mouse events aside from mouse-moved events
// (because it was removed from the "window cache" when it was hidden // (because it was removed from the "window cache" when it was hidden
// -- see below). Setting the window number to -1 and then back to its // -- see below). Setting the window number to -1 and then back to its
// original value seems to accomplish this. The idea was "borrowed" // original value seems to accomplish this. The idea was "borrowed"
// from the Java Embedding Plugin. // from the Java Embedding Plugin. This is fixed on macOS 10.14+.
NSInteger windowNumber = [mWindow windowNumber]; NSInteger windowNumber = [mWindow windowNumber];
[mWindow _setWindowNumber:-1]; [mWindow _setWindowNumber:-1];
[mWindow _setWindowNumber:windowNumber]; [mWindow _setWindowNumber:windowNumber];
}
// For reasons that aren't yet clear, calls to [NSWindow orderFront:] or // For reasons that aren't yet clear, calls to [NSWindow orderFront:] or
// [NSWindow makeKeyAndOrderFront:] can sometimes trigger "Error (1000) // [NSWindow makeKeyAndOrderFront:] can sometimes trigger "Error (1000)
// creating CGSWindow", which in turn triggers an internal inconsistency // creating CGSWindow", which in turn triggers an internal inconsistency
@ -951,17 +953,22 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState)
[nativeParentWindow removeChildWindow:mWindow]; [nativeParentWindow removeChildWindow:mWindow];
[mWindow orderOut:nil]; [mWindow orderOut:nil];
if (!nsCocoaFeatures::OnMojaveOrLater()) {
// Unless it's explicitly removed from NSApp's "window cache", a popup // Unless it's explicitly removed from NSApp's "window cache", a popup
// window will keep receiving mouse-moved events even after it's been // window will keep receiving mouse-moved events even after it's been
// "ordered out" (instead of the browser window that was underneath it, // "ordered out" (instead of the browser window that was underneath it,
// until you click on that window). This is bmo bug 378645, but it's // until you click on that window). This is bmo bug 378645, but it's
// surely an Apple bug. The "window cache" is an undocumented subsystem, // surely an Apple bug. The "window cache" is an undocumented
// all of whose methods are included in the NSWindowCache category of // subsystem, all of whose methods are included in the NSWindowCache
// the NSApplication class (in header files generated using class-dump). // category of the NSApplication class (in header files generated using
// This workaround was "borrowed" from the Java Embedding Plugin (which // class-dump). This workaround was "borrowed" from the Java Embedding
// uses it for a different purpose). // Plugin (which uses it for a different purpose). This is fixed on
if (mWindowType == eWindowType_popup) // macOS 10.14+.
if (mWindowType == eWindowType_popup) {
[NSApp _removeWindowFromCache:mWindow]; [NSApp _removeWindowFromCache:mWindow];
}
}
// If our popup window is a non-native context menu, tell the OS (and // If our popup window is a non-native context menu, tell the OS (and
// other programs) that a menu has closed. // other programs) that a menu has closed.