diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-03-07 12:32:08 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-03-08 01:22:19 +0100 |
| commit | f5afbd6d4b430fc4b10833aa2eb1a2cdfef933c0 (patch) | |
| tree | 37f45dc6be68265e9ffecb9eb46fbb7667dc3ef6 /src/plugins/platforms/cocoa | |
| parent | d7e2c9acf2d84edf8993c81b22a9b4d231aab4ed (diff) | |
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 <doris.verria@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
1 files 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() |