whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Remove content border thickness members from QCocoaWindow 

They were only set by QCocoaWindow::setContentBorderThickness(),
which was removed in 19fc78e967.

Pick-to: 6.5
Change-Id: Ia1b429c56c9627506023b76bddf878a4321d5f0b
Reviewed-by: Doris Verria <doris.verria@qt.io>
bb10
Tor Arne Vestbø 2023-03-07 12:58:46 +01:00
parent 6806ed373c
commit c80615b6cc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -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) { }

4
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -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;