(#481) Restore window maximized state

This commit is contained in:
Magne Sjaastad
2015-09-17 09:04:15 +02:00
parent f1233e485a
commit c6caea2869
3 changed files with 22 additions and 3 deletions

View File

@@ -31,7 +31,8 @@ int main(int argc, char *argv[])
QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)";
window.setWindowTitle("ResInsight " + platform);
window.setDefaultWindowSize();
window.show();
window.loadWinGeoAndDockToolBarLayout();
window.showWindow();
if (app.parseArguments())
{

View File

@@ -117,7 +117,6 @@ RiuMainWindow::RiuMainWindow()
// Store the layout so we can offer reset option
m_initialDockAndToolbarLayout = saveState(0);
loadWinGeoAndDockToolBarLayout();
sm_mainWindowInstance = this;
@@ -673,8 +672,9 @@ void RiuMainWindow::saveWinGeoAndDockToolBarLayout()
QByteArray layout = saveState(0);
settings.setValue("dockAndToolBarLayout", layout);
}
settings.setValue("isMaximized", isMaximized());
}
//--------------------------------------------------------------------------------------------------
///
@@ -699,6 +699,23 @@ void RiuMainWindow::loadWinGeoAndDockToolBarLayout()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::showWindow()
{
// Company and appname set through QCoreApplication
QSettings settings;
showNormal();
QVariant isMax = settings.value("isMaximized", false);
if (isMax.toBool())
{
showMaximized();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -94,6 +94,7 @@ public:
void hideAllDockWindows();
void loadWinGeoAndDockToolBarLayout();
void showWindow();
void setCurrentObjectInTreeView(caf::PdmObject* object);