From 097dfe0a24443ebd220c9d008fb72c2ac68d1641 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 5 Apr 2019 03:00:50 +0200 Subject: [PATCH] Ref T592, no more dock widget float/dock to init, init explicitly and when first opened --- src/blackgui/dockwidget.cpp | 3 +++ src/blackgui/infoarea.cpp | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 47bf93738..e713cf935 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -518,6 +518,9 @@ namespace BlackGui QSizePolicy sizePolicy = compWidget->sizePolicy(); sizePolicy.setVerticalStretch(1); // make the original widget occupying maximum space compWidget->setSizePolicy(sizePolicy); + + // hide status bar if not floating T592 no longer init floating + if (!this->isFloating()) { m_statusBar.hide(); } } void CDockWidget::showContextMenu(const QPoint &pos) diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index cb5a7d9fc..5bfd62120 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -565,15 +565,16 @@ namespace BlackGui { // float QPoint offset(i * 25, i * 20); - after->setVisible(false); - after->setFloating(true); + // after->setVisible(false); + // after->setFloating(true); after->setOffsetWhenFloating(offset); - QSize floatingSize = this->getPreferredSizeWhenFloating(i); + const QSize floatingSize = this->getPreferredSizeWhenFloating(i); after->setPreferredSizeWhenFloating(floatingSize); + after->initialFloating(); // dock again - after->setFloating(false); - after->setVisible(true); + // after->setFloating(false); + // after->setVisible(true); // reset floating flag, we want new resizing and position for first real floating after->resetWasAlreadyFloating(); @@ -802,7 +803,7 @@ namespace BlackGui // when toplevel is changed, I need a round in the event loop until // current tab bar widget is visible - QTimer::singleShot(250, this, &CInfoArea::emitInfoAreaStatus); + // QTimer::singleShot(250, this, &CInfoArea::emitInfoAreaStatus); } void CInfoArea::onStyleSheetChanged()