Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix restoring to correct screen when maximized

Browse Source
This commit is contained in:
Jonas Kvinge 2020-01-05 22:21:55 +01:00
parent 3cdc8dc4b6
commit 1468a821fb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/mainwindow.cpp
View File

@ -779,10 +779,11 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
// Set last used geometry to position window on the correct monitor // Set last used geometry to position window on the correct monitor
// Set window state only if the window was last maximized // Set window state only if the window was last maximized
if (settings_.contains("geometry")) {
restoreGeometry(settings_.value("geometry").toByteArray());
}
was_maximized_ = settings_.value("maximized", true).toBool(); was_maximized_ = settings_.value("maximized", true).toBool();
if (was_maximized_) setWindowState(windowState() | Qt::WindowMaximized); if (was_maximized_) setWindowState(windowState() | Qt::WindowMaximized);
else restoreGeometry(settings_.value("geometry").toByteArray());
if (!ui_->splitter->restoreState(settings_.value("splitter_state").toByteArray())) { if (!ui_->splitter->restoreState(settings_.value("splitter_state").toByteArray())) {
ui_->splitter->setSizes(QList<int>() << 250 << width() - 250); ui_->splitter->setSizes(QList<int>() << 250 << width() - 250);
@ -1167,10 +1168,8 @@ void MainWindow::SaveGeometry() {
if (!initialised_) return; if (!initialised_) return;
was_maximized_ = isMaximized(); settings_.setValue("maximized", isMaximized());
settings_.setValue("maximized", was_maximized_); settings_.setValue("geometry", saveGeometry());
if (was_maximized_) settings_.remove("geometry");
else settings_.setValue("geometry", saveGeometry());
settings_.setValue("splitter_state", ui_->splitter->saveState()); settings_.setValue("splitter_state", ui_->splitter->saveState());
} }