OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp
View File

@@ -139,7 +139,7 @@ void RimMdiWindowController::setupBeforeSave()
{
if ( viewWidget() && getMainWindow() )
{
this->setMdiWindowGeometry( getMainWindow()->windowGeometryForViewer( viewWidget() ) );
setMdiWindowGeometry( getMainWindow()->windowGeometryForViewer( viewWidget() ) );
}
}
@@ -157,7 +157,7 @@ void RimMdiWindowController::updateViewerWidget()
{
QMdiSubWindow* viewWindow = mainWindow->createViewWindow();
QWidget* viewWidget = viewPdmObject()->createViewWidget( viewWindow );
mainWindow->initializeViewer( viewWindow, viewWidget, this->mdiWindowGeometry() );
mainWindow->initializeViewer( viewWindow, viewWidget, mdiWindowGeometry() );
viewPdmObject()->updateViewWidgetAfterCreation();
}
@@ -168,7 +168,7 @@ void RimMdiWindowController::updateViewerWidget()
{
if ( viewWidget() )
{
this->setMdiWindowGeometry( mainWindow->windowGeometryForViewer( viewWidget() ) );
setMdiWindowGeometry( mainWindow->windowGeometryForViewer( viewWidget() ) );
mainWindow->removeViewer( viewWidget() );