r22007 by jghali - #14717: Margin line not shown if exactly on a "Major" grid line

[scribus-commit]

Author: jghali
Date: Fri Apr 28 20:20:47 2017
New Revision: 22007

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22007
Log:
#14717: Margin line not shown if exactly on a "Major" grid line

This change default rendering order, from bottom to top, to: Grid, Margins, Content Objects, Baseline Grid, Guides

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22007&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Fri Apr 28 20:20:47 2017
@@ -212,7 +212,7 @@
 	appPrefs.guidesPrefs.guideColor = QColor(Qt::darkBlue);
 	appPrefs.guidesPrefs.baselineGridColor = QColor(Qt::lightGray);
 	appPrefs.guidesPrefs.renderStackOrder.clear();
-	appPrefs.guidesPrefs.renderStackOrder << 0 << 1 << 2 << 3 << 4;
+	appPrefs.guidesPrefs.renderStackOrder << 2 << 0 << 4 << 1 << 3;
 	appPrefs.guidesPrefs.gridType = 0;
 	appPrefs.typoPrefs.valueSuperScript = 33;
 	appPrefs.typoPrefs.scalingSuperScript = 66;
@@ -2081,7 +2081,7 @@
 			if (dc.hasAttribute("renderStack"))
 			{
 				appPrefs.guidesPrefs.renderStackOrder.clear();
-				QString renderStack = dc.attribute("renderStack", "0 1 2 3 4");
+				QString renderStack = dc.attribute("renderStack", "2 0 4 1 3");
 				ScTextStream fp(&renderStack, QIODevice::ReadOnly);
 				QString val;
 				while (!fp.atEnd())