diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2021-08-02 14:43:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-12 12:52:20 +0000 |
| commit | 8964a59368225d881045bad756a402a8f632d1fb (patch) | |
| tree | 171a5387d67b74552cc4e6c71d3a377ba1f91cff | |
| parent | 4c1a95efa9706d3e8a6a43aa5455a96c57dbe61a (diff) | |
Allow dragging of a floating dockwidget on macOS with a custom titlebar
This amends 3224c6d7d150164241c13ccf7d47377a39c0a6bb to account for the
case when the dockwidget is already floating.
Task-number: QTBUG-70137
Change-Id: If8b345565b11b44beb3fb4b697cfe812c29c6396
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ba3e1fe09b7d921985e21d857a1d566465095e69)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index b391f278b2..e40112bd14 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -975,7 +975,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) > QApplication::startDragDistance()) { #ifdef Q_OS_MACOS - if (windowHandle()) { + if (windowHandle() && !q->isFloating()) { // When using native widgets on mac, we have not yet been successful in // starting a drag on an NSView that belongs to one window (QMainWindow), // but continue the drag on another (QDockWidget). This is what happens if |