Merge pull request #747 from isanae/splash-monitor

Display the splash screen on the same monitor as the main window

src/main.cpp

@@ -597,6 +597,17 @@ int runApplication(MOApplication &application, SingleInstance &instance,
 
     QPixmap pixmap(splashPath);
     QSplashScreen splash(pixmap);
+
+    if (settings.contains("window_monitor")) {
+      const int monitor = settings.value("window_monitor").toInt();
+
+      if (monitor != -1) {
+        QDesktopWidget* desktop = QApplication::desktop();
+        const QPoint center = desktop->availableGeometry(monitor).center();
+        splash.move(center - splash.rect().center());
+      }
+    }
+
     splash.show();
     splash.activateWindow();
 

src/mainwindow.cpp

@@ -2008,6 +2008,7 @@ void MainWindow::storeSettings(QSettings &settings) {
     settings.remove("toolbar_size");
     settings.remove("toolbar_button_style");
     settings.remove("window_split");
+    settings.remove("window_monitor");
     settings.remove("log_split");
     settings.remove("filters_visible");
     settings.remove("browser_geometry");
@@ -2019,6 +2020,7 @@ void MainWindow::storeSettings(QSettings &settings) {
     settings.setValue("toolbar_size", ui->toolBar->iconSize());
     settings.setValue("toolbar_button_style", static_cast<int>(ui->toolBar->toolButtonStyle()));
     settings.setValue("window_split", ui->splitter->saveState());
+    settings.setValue("window_monitor", QApplication::desktop()->screenNumber(this));
     settings.setValue("log_split", ui->topLevelSplitter->saveState());
     settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry());
     settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked());