Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respawn mainwindow on correct monitor

Browse Source 
PR #5081 created a regression where the mainwindow will always start on the primary monitor regardless of which one it was closed on when maximized. This restores previous functionality.
This commit is contained in:
Mark Furneaux 2015-11-22 00:35:27 -05:00
parent dd45181f4a
commit fa0a9d315c
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/ui/mainwindow.cpp
View File

@ -903,14 +903,13 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
qLog(Debug) << "Loading settings";
settings_.beginGroup(kSettingsGroup);
// Set window Geometry if the window was closed in normal mode
// else set it to window maximized
// Set last used geometry to position window on the correct monitor
// Set window state only if the window was last maximized
was_maximized_ = settings_.value("maximized", false).toBool();
if (!was_maximized_) {
restoreGeometry(settings_.value("geometry").toByteArray());
} else {
restoreGeometry(settings_.value("geometry").toByteArray());
if (was_maximized_) {
setWindowState(windowState() | Qt::WindowMaximized);
}
}
if (!ui_->splitter->restoreState(
settings_.value("splitter_state").toByteArray())) {