From 5dcec07b9eceaa1ddf4993c25a627293c9e8219b Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 1 Aug 2020 13:49:39 -0700 Subject: [PATCH] Popout graphs phase II: Fix height of popped-out graphs Popped-out graphs no longer can have their height adjusted by pulling on dock or widget window. This is a work-around to a problem when popping-out multiple graphs, heights of early graphs were increased and heights of the latter graphs were too small. --- oscar/Graphs/gGraphView.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 6509486d..6673b025 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -466,7 +466,7 @@ void gGraphView::popoutGraph() newDockWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); newDockWidget->setMouseTracking(true); int titleBarHeight = 30; - int newDockHeight = dock->height()+popout_graph->height()+titleBarHeight+2; // +2 for group box border + int newDockHeight = dock->height()+popout_graph->height()+titleBarHeight/*+2*/; // +2 for group box border qDebug() << "widget geometry" << newDockWidget->frameGeometry() << "title bar height" << titleBarHeight; if (newDockHeight > screenHeight) { QMessageBox::warning(nullptr, STR_MessageBox_Warning, @@ -475,7 +475,7 @@ void gGraphView::popoutGraph() } qDebug() << "dock height" << dock->height() << "popout graph height" << popout_graph->height(); dock->resize(dock->width(), newDockHeight); - + newDockWidget->setMinimumHeight(popout_graph->height()+titleBarHeight); newDockWidget->resize(width(), popout_graph->height()+titleBarHeight); qDebug() << "dock height resized to" << dock->height() << "widget resized to" << newDockWidget->height(); //////// End resize dock to hold new widget @@ -487,7 +487,6 @@ void gGraphView::popoutGraph() dock->addDockWidget(Qt::BottomDockWidgetArea, newDockWidget, Qt::Vertical); /////// Fix some resize glitches /////// - // https://stackoverflow.com/questions/26286646/create-a-qdockwidget-that-resizes-to-its-contents?rq=1 QDockWidget* dummy = new QDockWidget; dock->addDockWidget(Qt::BottomDockWidgetArea, dummy); dock->removeDockWidget(dummy);