r20643 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Dec 30 23:02:37 2015
New Revision: 20643

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20643
Log:
fix text striketrough effect not being always rendered

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/scpageoutput.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20643&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Wed Dec 30 23:02:37 2015
@@ -2923,9 +2923,12 @@
 			}
 			if (style.baselineOffset() != 0)
 				st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0);
+			int oldStrokeMode = p->strokeMode();
 			p->setPen(p->brush());
 			p->setLineWidth(lw);
+			p->setStrokeMode(1);
 			p->drawLine(FPoint(glyphs.xoffset, glyphs.yoffset - st), FPoint(glyphs.xoffset + glyphs.xadvance, glyphs.yoffset - st));
+			p->setStrokeMode(oldStrokeMode);
 		}
 	}
 /*	else

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20643&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Wed Dec 30 23:02:37 2015
@@ -642,9 +642,12 @@
 			}
 			if (style.baselineOffset() != 0)
 				st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0);
+			int tmpStrokeMode = painter->strokeMode();
 			painter->setPen(painter->brush());
 			painter->setLineWidth(lw);
+			painter->setStrokeMode(1);
 			painter->drawLine(FPoint(glyphs.xoffset, glyphs.yoffset - st), FPoint(glyphs.xoffset + glyphs.xadvance, glyphs.yoffset - st));
+			painter->setStrokeMode(tmpStrokeMode);
 		}
 	}
 	/*else