From 8c2d2b06674a6dd0071e16f3eb62e7428bc3d581 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 23 Mar 2020 22:29:43 +0100 Subject: [PATCH] Floating dock widget close issue with Qt 5.14.1 see https://discordapp.com/channels/539048679160676382/539846348275449887/691667651285483564 --- src/blackgui/dockwidget.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 88700baea..563d30e2d 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -379,15 +379,25 @@ namespace BlackGui if (this->isFloating()) { this->toggleFloating(); + + /** + * since update to Qt 5.14.1 this kills the window + * https://discordapp.com/channels/539048679160676382/539846348275449887/691667651285483564 + * \todo code can be removed AFTER 8-2020 + QPointer myself(this); QTimer::singleShot(500, this, [ = ] { - if (myself) { myself->close(); } + // if (myself) { myself->close(); } }); + **/ + event->setAccepted(false); // refuse -> do not close - return; } - QDockWidget::closeEvent(event); + else + { + QDockWidget::closeEvent(event); + } } void CDockWidget::paintEvent(QPaintEvent *event)