Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions omodsim/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1840,13 +1840,7 @@ void MainWindow::loadSettings()

QSettings m(filepath, QSettings::IniFormat, this);

const auto geometry = m.value("WindowGeometry", this->geometry()).toRect();
setGeometry(geometry);

const bool isMaximized = m.value("WindowMaximized").toBool();
if(isMaximized) {
showMaximized();
}
restoreGeometry(m.value("WindowGeometry").toByteArray());

const auto viewMode = (QMdiArea::ViewMode)qBound(0, m.value("ViewMode", QMdiArea::SubWindowView).toInt(), 1);
ui->mdiArea->setViewMode(viewMode);
Expand Down Expand Up @@ -1901,6 +1895,8 @@ void MainWindow::loadSettings()
}
}
}

restoreState(m.value("WindowState").toByteArray());
}

///
Expand Down Expand Up @@ -1934,8 +1930,8 @@ void MainWindow::saveSettings()
m.clear();
m.sync();

m.setValue("WindowMaximized", isMaximized());
m.setValue("WindowGeometry", isMaximized()? normalGeometry() : geometry());
m.setValue("WindowGeometry", saveGeometry());
m.setValue("WindowState", saveState());

const auto frm = currentMdiChild();
if(frm) m.setValue("ActiveWindow", frm->windowTitle());
Expand Down