2 files changed, 28 insertions, 14 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 0905ba3e644..1b34490e358 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -330,6 +330,13 @@ QMargins QCocoaWindow::safeAreaMargins() const
     // merge them.
     auto screenRect = m_view.window.screen.frame;
     auto screenInsets = m_view.window.screen.safeAreaInsets;
+    auto screenSafeArea = QCocoaScreen::mapFromNative(NSMakeRect(
+        NSMinX(screenRect) + screenInsets.left,
+        NSMinY(screenRect) + screenInsets.bottom, // Non-flipped
+        NSWidth(screenRect) - screenInsets.left - screenInsets.right,
+        NSHeight(screenRect) - screenInsets.top - screenInsets.bottom
+    ));
+
     auto screenRelativeViewBounds = QCocoaScreen::mapFromNative(
         [m_view.window convertRectToScreen:
             [m_view convertRect:m_view.bounds toView:nil]]
@@ -339,20 +346,10 @@ QMargins QCocoaWindow::safeAreaMargins() const
     // Note that we do not want represent the area outside of the
     // screen as being outside of the safe area.
     QMarginsF screenSafeAreaMargins = {
-        screenInsets.left ?
-            qMax(0.0f, screenInsets.left - screenRelativeViewBounds.left())
-            : 0.0f,
-        screenInsets.top ?
-            qMax(0.0f, screenInsets.top - screenRelativeViewBounds.top())
-            : 0.0f,
-        screenInsets.right ?
-            qMax(0.0f, screenInsets.right
-                - (screenRect.size.width - screenRelativeViewBounds.right()))
-            : 0.0f,
-        screenInsets.bottom ?
-            qMax(0.0f, screenInsets.bottom
-                - (screenRect.size.height - screenRelativeViewBounds.bottom()))
-            : 0.0f
+        qMin(screenSafeArea.left() - screenRelativeViewBounds.left(), screenInsets.left),
+        qMin(screenSafeArea.top() - screenRelativeViewBounds.top(), screenInsets.top),
+        qMin(screenRelativeViewBounds.right() - screenSafeArea.right(), screenInsets.right),
+        qMin(screenRelativeViewBounds.bottom() - screenSafeArea.bottom(), screenInsets.bottom)
     };
 
     return (screenSafeAreaMargins | viewSafeAreaMargins).toMargins();
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index a6d96df0fbb..b00e6375e1a 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -269,6 +269,23 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMenuHelper);
     qCDebug(lcQpaWindow) << "Done moving" << self << "to" << self.window;
 }
 
+// QWindow::setParent() promises that the child window will be clipped
+// to its parent, which we rely on in e.g. Qt Widgets when a native window
+// is added to a scroll area. We try to be smart and only enable clipping
+// if we have potential child QWindows that rely on this behavior.
+// FIXME: Be even smarter, and only consider QWindow based subviews,
+// in a way that also includes foreign windows.
+
+- (void)didAddSubview:(NSView *)subview
+{
+    self.clipsToBounds = YES;
+}
+
+- (void)willRemoveSubview:(NSView *)subview
+{
+    self.clipsToBounds = self.subviews.count > 1;
+}
+
 // ----------------------------------------------------------------------------
 
 - (QWindow *)topLevelWindow