r20560 by fschmid -

[scribus-commit]

Author: fschmid
Date: Wed Nov 18 19:29:47 2015
New Revision: 20560

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20560
Log:
Fixed Bug #12245: grouped lines appear thicker

Modified:
    trunk/Scribus/scribus/pageitem_group.cpp
    trunk/Scribus/scribus/scpainter.cpp

Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20560&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_group.cpp	Wed Nov 18 19:29:47 2015
@@ -190,8 +190,7 @@
 	else
 		p->beginLayer(1.0 - fillTransparency(), fillBlendmode());
 	p->setMaskMode(0);
-	if (((m_width / groupWidth) != 1.0) || ((m_height / groupHeight) != 1.0))
-		p->scale(m_width / groupWidth, m_height / groupHeight);
+	p->scale(m_width / groupWidth, m_height / groupHeight);
 	for (int em = 0; em < groupItemList.count(); ++em)
 	{
 		PageItem* embedded = groupItemList.at(em);

Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20560&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp	(original)
+++ trunk/Scribus/scribus/scpainter.cpp	Wed Nov 18 19:29:47 2015
@@ -228,7 +228,7 @@
 void ScPainter::scale( double x, double y )
 {
 	cairo_scale (m_cr, x, y);
-	m_zoomFactor = qMax(x, y);
+	m_zoomFactor *= qMax(x, y);
 }
 
 void ScPainter::moveTo( const double &x, const double &y )