r23584 by craig - Include vertical correction for main window positioning. Now works for

[scribus-commit]

Author: craig
Date: Fri Apr 10 19:27:41 2020
New Revision: 23584

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23584
Log:
Include vertical correction for main window positioning. Now works for
two screens placed above each other.

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23584&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Fri Apr 10 19:27:41 2020
@@ -982,7 +982,7 @@
 	int currentScreenYPos=0;
 	ScCore->primaryMainWindow()->getScreenPosition(currentScreenXPos, currentScreenYPos);
 	appPrefs.uiPrefs.mainWinSettings.xPosition = ScCore->primaryMainWindow()->pos().x() - currentScreenXPos;
-	appPrefs.uiPrefs.mainWinSettings.yPosition = ScCore->primaryMainWindow()->pos().y();
+	appPrefs.uiPrefs.mainWinSettings.yPosition = ScCore->primaryMainWindow()->pos().y() - currentScreenYPos;
 	appPrefs.uiPrefs.mainWinSettings.width = ScCore->primaryMainWindow()->size().width();
 	appPrefs.uiPrefs.mainWinSettings.height = ScCore->primaryMainWindow()->size().height();
 	appPrefs.uiPrefs.mainWinSettings.maximized = ScCore->primaryMainWindow()->isMaximized();

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23584&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp	(original)
+++ trunk/Scribus/scribus/scribuscore.cpp	Fri Apr 10 19:27:41 2020
@@ -211,9 +211,11 @@
 	QPixmap pix = IconManager::instance().loadPixmap("scribus_splash.png", true);
 	m_SplashScreen = new ScSplashScreen(pix, Qt::WindowStaysOnTopHint);
 	if (m_SplashScreen != nullptr)
+	{
 		m_SplashScreen->show();
-	if (m_SplashScreen != nullptr && m_SplashScreen->isVisible())
-		setSplashStatus(QObject::tr("Initializing..."));
+		if (m_SplashScreen->isVisible())
+			setSplashStatus(QObject::tr("Initializing..."));
+	}
 }
 
 void ScribusCore::setSplashStatus(const QString& newText)