chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Popout graphs phase II: Fix height of popped-out graphs

Browse Source 
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.
This commit is contained in:
Guy Scharf 2020-08-01 13:49:39 -07:00
parent 2712fad0c6
commit 5dcec07b9e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/Graphs/gGraphView.cpp
View File

@ -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);