diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-09-03 14:15:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-03 20:50:02 +0000 |
| commit | 93c934acc82ae8f62566387deaadb53a04535717 (patch) | |
| tree | 712b43007072232a756bfe113d3866efd6e89a09 | |
| parent | 7dbab10b92485c182f3570d79a88a83e52fb582b (diff) | |
Doc: add more notes about full screen windows on macOS
Fixes: QTBUG-68069
Change-Id: I8fc99f708cfa19a9c8cc8d13f6889549c79dd3b3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f70421bfc0f0c1b4da730154b49f425a6b0bb08e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 51f1984842..83c776a485 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2215,6 +2215,9 @@ void QWindow::showMaximized() Equivalent to calling setWindowStates(Qt::WindowFullScreen) and then setVisible(true). + See the \l{QWidget::showFullScreen()} documentation for platform-specific + considerations and limitations. + \sa setWindowStates(), setVisible() */ void QWindow::showFullScreen() diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 55b4b8ef03..f56fe8559d 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -2983,9 +2983,9 @@ bool QWidget::isFullScreen() const Calling this function only affects \l{isWindow()}{windows}. - To return from full-screen mode, call showNormal(). + To return from full-screen mode, call showNormal() or close(). - Full-screen mode works fine under Windows, but has certain + \note Full-screen mode works fine under Windows, but has certain problems under X. These problems are due to limitations of the ICCCM protocol that specifies the communication between X11 clients and the window manager. ICCCM simply does not understand @@ -3005,7 +3005,14 @@ bool QWidget::isFullScreen() const X11 window managers that follow modern post-ICCCM specifications support full-screen mode properly. - \sa showNormal(), showMaximized(), show(), hide(), isVisible() + On macOS, showing a window full screen puts the entire application in + full-screen mode, providing it with a dedicated desktop. Showing another + window while the application runs in full-screen mode might automatically + make that window full screen as well. To prevent that, exit full-screen + mode by calling showNormal() or by close() on the full screen window + before showing another window. + + \sa showNormal(), showMaximized(), show(), isVisible(), close() */ void QWidget::showFullScreen() { |