diff options
| author | Axel Spoerl <[email protected]> | 2024-02-28 15:09:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-03-04 13:08:04 +0000 |
| commit | e8b2047a9bfd53415bb846c66197e1a26c93a13b (patch) | |
| tree | 2e373f1d46af966c00c1c18c9f8566123f6fa725 | |
| parent | 4c1935f227e1c3ecca0bc325d0b5222c5ecffcfc (diff) | |
QDockWidget: Use resizer without native window decoration
975c0bdf732ea7c5f7632913a27a1b6ae5cd5b26 has disabled usage of a resizer
on Windows. This has caused a regression, when a dock widget was
rendered frameless.
Use a resizer in that case.
Fixes: QTBUG-120694
Task-number: QTBUG-102196
Pick-to: 6.5 6.2
Change-Id: I9fbcb1a8b1d8869995093bc1da7524ec81e9f02d
Reviewed-by: Oliver Wolff <[email protected]>
(cherry picked from commit 89fc58127d449cc2995879ff334567141e9c1d58)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 80532288174dc5bd4b23bd13ae53faeafad8ceeb)
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 7792bea118a..8f89173a661 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -902,15 +902,15 @@ Qt::DockWidgetArea QDockWidgetPrivate::toDockWidgetArea(QInternal::DockPosition void QDockWidgetPrivate::setResizerActive(bool active) { -#ifdef Q_OS_WINDOWS - Q_UNUSED(active); -#else Q_Q(QDockWidget); + const auto *dwLayout = qobject_cast<QDockWidgetLayout *>(layout); + if (dwLayout->nativeWindowDeco(q->isFloating())) + return; + if (active && !resizer) resizer = new QWidgetResizeHandler(q); if (resizer) resizer->setEnabled(active); -#endif } bool QDockWidgetPrivate::isAnimating() const |