From 65465c26938f7a43f11a7f598d5820b30d791776 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 6 Oct 2022 13:57:07 +0200 Subject: [PATCH] QCocoaWindow::windowStyleMask: make popups non-resizable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise, context menu can be resized. Task-number: QTBUG-106925 Change-Id: I409d0113fd92ca89b14f068c391dd9c0ddb79ce7 Reviewed-by: Tor Arne Vestbø (cherry picked from commit e17372e723555cd9eb7b4efcb553812e0b98f37b) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoawindow.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 309f225a935..8a1aee3ad4c 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -526,9 +526,11 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags) // working (for example minimizing frameless windows, or resizing // windows that don't have zoom or fullscreen titlebar buttons). styleMask |= NSWindowStyleMaskClosable - | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable; + if (type != Qt::Popup) // We only care about popups exactly. + styleMask |= NSWindowStyleMaskResizable; + if (type == Qt::Tool) styleMask |= NSWindowStyleMaskUtilityWindow;