diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:42 +0000 |
| commit | da4c7e7ed675c3bf405668739c3012d140856109 (patch) | |
| tree | cdd868dba063fecba609a1d819de271f0d51b23e /xpfe/appshell/nsAppShellService.cpp | |
| parent | Adding upstream version 125.0.3. (diff) | |
| download | firefox-da4c7e7ed675c3bf405668739c3012d140856109.tar.xz firefox-da4c7e7ed675c3bf405668739c3012d140856109.zip | |
Adding upstream version 126.0.upstream/126.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpfe/appshell/nsAppShellService.cpp')
| -rw-r--r-- | xpfe/appshell/nsAppShellService.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp index 1ac989aaa3..06f2476c25 100644 --- a/xpfe/appshell/nsAppShellService.cpp +++ b/xpfe/appshell/nsAppShellService.cpp @@ -579,26 +579,11 @@ nsresult nsAppShellService::JustCreateTopWindow( !!(aChromeMask & nsIWebBrowserChrome::CHROME_ALERT) && widgetInitData.mWindowType == widget::WindowType::Dialog; -#ifdef XP_MACOSX - // Mac OS X sheet support - // Adding CHROME_OPENAS_CHROME to sheetMask makes modal windows opened from - // nsGlobalWindow::ShowModalDialog() be dialogs (not sheets), while modal - // windows opened from nsPromptService::DoDialog() still are sheets. This - // fixes bmo bug 395465 (see nsCocoaWindow::StandardCreate() and - // nsCocoaWindow::SetModal()). - uint32_t sheetMask = nsIWebBrowserChrome::CHROME_OPENAS_DIALOG | - nsIWebBrowserChrome::CHROME_MODAL | - nsIWebBrowserChrome::CHROME_OPENAS_CHROME; - if (parent && (parent != mHiddenWindow) && - ((aChromeMask & sheetMask) == sheetMask)) { - widgetInitData.mWindowType = widget::WindowType::Sheet; - } -#endif - #if defined(XP_WIN) if (widgetInitData.mWindowType == widget::WindowType::TopLevel || - widgetInitData.mWindowType == widget::WindowType::Dialog) + widgetInitData.mWindowType == widget::WindowType::Dialog) { widgetInitData.mClipChildren = true; + } #endif // note default chrome overrides other OS chrome settings, but |