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

(#484) If current window is mazimized, show new window in maximized state

Browse Source
This commit is contained in:
Magne Sjaastad
2015-09-21 13:25:38 +02:00
parent e8079783cb
commit e7866cbdfd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -1212,7 +1212,7 @@ void RiuMainWindow::addViewer(QWidget* viewer, const std::vector<int>& windowsGe
QSize subWindowSize; QSize subWindowSize;
QPoint subWindowPos(-1, -1); QPoint subWindowPos(-1, -1);
bool showMax = false; bool initialStateMaximized = false;
if (windowsGeometry.size() == 5) if (windowsGeometry.size() == 5)
{ {
@@ -1221,7 +1221,7 @@ void RiuMainWindow::addViewer(QWidget* viewer, const std::vector<int>& windowsGe
if (windowsGeometry[4] > 0) if (windowsGeometry[4] > 0)
{ {
showMax = true; initialStateMaximized = true;
} }
} }
else else
@@ -1238,11 +1238,16 @@ void RiuMainWindow::addViewer(QWidget* viewer, const std::vector<int>& windowsGe
if (m_mdiArea->subWindowList().size() < 1) if (m_mdiArea->subWindowList().size() < 1)
{ {
// Show first 3D view maximized // Show first 3D view maximized
showMax = true; initialStateMaximized = true;
} }
} }
} }
if (m_mdiArea->currentSubWindow() && m_mdiArea->currentSubWindow()->isMaximized())
{
initialStateMaximized = true;
}
subWin->show(); subWin->show();
// Move and resize must be done after window is visible // Move and resize must be done after window is visible
@@ -1254,7 +1259,7 @@ void RiuMainWindow::addViewer(QWidget* viewer, const std::vector<int>& windowsGe
} }
subWin->resize(subWindowSize); subWin->resize(subWindowSize);
if (showMax) if (initialStateMaximized)
{ {
subWin->showMaximized(); subWin->showMaximized();
} }