Skip to content

Commit b3c91ea

Browse files
committed
fix: admit Cocoa patch through whitespace gate
1 parent 4dc2033 commit b3c91ea

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

‎tools/patches/qt-cocoa-pending-fullscreen-state.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/
66
#include <QRect>
77
#include <QPointer>
88
+#include <optional>
9-
9+
1010
#ifndef QT_NO_OPENGL
1111
#include "qcocoaglcontext.h"
1212
@@ -245,6 +246,7 @@
1313
QCocoaNSWindow *m_nsWindow = nil;
14-
14+
1515
Qt::WindowStates m_lastReportedWindowState = Qt::WindowNoState;
1616
+ std::optional<Qt::WindowStates> m_pendingFullScreenState;
1717
Qt::WindowModality m_windowModality = Qt::NonModal;
18-
18+
1919
static QPointer<QCocoaWindow> s_windowUnderMouse;
2020
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
2121
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -38,7 +38,7 @@ diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms
3838
}
3939
@@ -955,6 +964,15 @@
4040
setWindowFlags(window()->flags());
41-
41+
4242
handleWindowStateChanged();
4343
+
4444
+ // A native titlebar entry has no pending Qt request. Do not undo it.
@@ -50,5 +50,5 @@ diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms
5050
+ window()->setWindowStates(requestedState);
5151
+ }
5252
}
53-
53+
5454
void QCocoaWindow::windowWillExitFullScreen()

0 commit comments

Comments
 (0)