From f5afbd6d4b430fc4b10833aa2eb1a2cdfef933c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 7 Mar 2023 12:32:08 +0100 Subject: [PATCH] macOS: Move setMask call out of recreateWindowIfNeeded It semantically applies during platform window initialization, and doesn't depend on the logic of choosing an appropriate NSWindow class. Pick-to: 6.5 Change-Id: Ia24a2deafc78ed4c79df766b6372ad64de2d0dde Reviewed-by: Doris Verria --- src/plugins/platforms/cocoa/qcocoawindow.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index f3a0cadd52..f7b3bcc6d7 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -147,6 +147,8 @@ void QCocoaWindow::initialize() recreateWindowIfNeeded(); + setMask(QHighDpi::toNativeLocalRegion(window()->mask(), window())); + m_initialized = true; } @@ -1530,8 +1532,6 @@ void QCocoaWindow::recreateWindowIfNeeded() [parentCocoaWindow->m_view addSubview:m_view]; [m_view setHidden:!window()->isVisible()]; } - - setMask(QHighDpi::toNativeLocalRegion(window()->mask(), window())); } void QCocoaWindow::requestUpdate()