diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-03-07 12:58:46 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-03-08 01:22:19 +0100 |
commit | c80615b6cc3ef1ed10837291b5ae6adef0428e14 (patch) | |
tree | 894fadfe1982c331a367d9a2385d0f2aa330a0c7 /src/plugins/platforms/cocoa | |
parent | 6806ed373c9ef4848efa9d47e93afb9abb196c42 (diff) |
macOS: Remove content border thickness members from QCocoaWindow
They were only set by QCocoaWindow::setContentBorderThickness(),
which was removed in 19fc78e9672f4350a06790a9a0f0edba75244875.
Pick-to: 6.5
Change-Id: Ia1b429c56c9627506023b76bddf878a4321d5f0b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index ffbf9a2f48..265ded0204 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -243,8 +243,6 @@ public: // for QNSView NSInteger m_alertRequest = NoAlertRequest; bool m_drawContentBorderGradient = false; - int m_topContentBorderThickness = 0; - int m_bottomContentBorderThickness = 0; struct BorderRange { BorderRange(quintptr i, int u, int l) : identifier(i), upper(u), lower(l) { } diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 423186295b..de49baf1e7 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1848,7 +1848,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) // Find consecutive registered border areas, starting from the top. std::vector<BorderRange> ranges(m_contentBorderAreas.cbegin(), m_contentBorderAreas.cend()); std::sort(ranges.begin(), ranges.end()); - int effectiveTopContentBorderThickness = m_topContentBorderThickness; + int effectiveTopContentBorderThickness = 0; for (BorderRange range : ranges) { // Skip disiabled ranges (typically hidden tool bars) if (!m_enabledContentBorderAreas.value(range.identifier, false)) @@ -1863,7 +1863,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) break; } - int effectiveBottomContentBorderThickness = m_bottomContentBorderThickness; + int effectiveBottomContentBorderThickness = 0; [window setStyleMask:[window styleMask] | NSWindowStyleMaskTexturedBackground]; window.titlebarAppearsTransparent = YES; |