diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index caf47e38d3..ffd1bc5b6e 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -134,8 +134,6 @@ public: void beep() const override; void quit() const override; - void closePopups(QWindow *forWindow = nullptr); - private Q_SLOTS: void focusWindowChanged(QWindow *); diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 9f225d71c0..e936a7c121 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -496,19 +496,6 @@ void QCocoaIntegration::quit() const [NSApp terminate:nil]; } -void QCocoaIntegration::closePopups(QWindow *forWindow) -{ - for (auto it = m_popupWindowStack.begin(); it != m_popupWindowStack.end();) { - auto *popup = *it; - if (!forWindow || popup->window()->transientParent() == forWindow) { - it = m_popupWindowStack.erase(it); - QWindowSystemInterface::handleCloseEvent(popup->window()); - } else { - ++it; - } - } -} - void QCocoaIntegration::focusWindowChanged(QWindow *focusWindow) { // Don't revert icon just because we lost focus diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 9a2fa5f025..419f07b779 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -153,13 +153,11 @@ public: Q_NOTIFICATION_HANDLER(NSViewFrameDidChangeNotification) void viewDidChangeFrame(); Q_NOTIFICATION_HANDLER(NSViewGlobalFrameDidChangeNotification) void viewDidChangeGlobalFrame(); - Q_NOTIFICATION_HANDLER(NSWindowWillMoveNotification) void windowWillMove(); Q_NOTIFICATION_HANDLER(NSWindowDidMoveNotification) void windowDidMove(); Q_NOTIFICATION_HANDLER(NSWindowDidResizeNotification) void windowDidResize(); Q_NOTIFICATION_HANDLER(NSWindowDidEndLiveResizeNotification) void windowDidEndLiveResize(); Q_NOTIFICATION_HANDLER(NSWindowDidBecomeKeyNotification) void windowDidBecomeKey(); Q_NOTIFICATION_HANDLER(NSWindowDidResignKeyNotification) void windowDidResignKey(); - Q_NOTIFICATION_HANDLER(NSWindowWillMiniaturizeNotification) void windowWillMiniaturize(); Q_NOTIFICATION_HANDLER(NSWindowDidMiniaturizeNotification) void windowDidMiniaturize(); Q_NOTIFICATION_HANDLER(NSWindowDidDeminiaturizeNotification) void windowDidDeminiaturize(); Q_NOTIFICATION_HANDLER(NSWindowWillEnterFullScreenNotification) void windowWillEnterFullScreen(); @@ -170,7 +168,6 @@ public: Q_NOTIFICATION_HANDLER(NSWindowDidOrderOffScreenNotification) void windowDidOrderOffScreen(); Q_NOTIFICATION_HANDLER(NSWindowDidChangeOcclusionStateNotification) void windowDidChangeOcclusionState(); Q_NOTIFICATION_HANDLER(NSWindowDidChangeScreenNotification) void windowDidChangeScreen(); - Q_NOTIFICATION_HANDLER(NSWindowWillCloseNotification) void windowWillClose(); bool windowShouldClose(); bool windowIsPopupType(Qt::WindowType type = Qt::Widget) const; diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 242d442a19..6a826b4d66 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -834,11 +834,6 @@ void QCocoaWindow::windowDidExitFullScreen() } } -void QCocoaWindow::windowWillMiniaturize() -{ - QCocoaIntegration::instance()->closePopups(window()); -} - void QCocoaWindow::windowDidMiniaturize() { if (!isContentView()) @@ -1159,12 +1154,6 @@ void QCocoaWindow::viewDidChangeGlobalFrame() // callback should make sure to filter out notifications if they do not // apply to that QCocoaWindow, e.g. if the window is not a content view. -void QCocoaWindow::windowWillMove() -{ - // Close any open popups on window move - QCocoaIntegration::instance()->closePopups(); -} - void QCocoaWindow::windowDidMove() { if (!isContentView()) @@ -1305,13 +1294,6 @@ void QCocoaWindow::windowDidChangeScreen() } } -void QCocoaWindow::windowWillClose() -{ - // Close any open popups on window closing. - if (window() && !windowIsPopupType(window()->type())) - QCocoaIntegration::instance()->closePopups(); -} - // ----------------------- NSWindowDelegate callbacks ----------------------- bool QCocoaWindow::windowShouldClose()