r21286 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Thu May 5 22:32:15 UTC 2016


Author: jghali
Date: Thu May  5 22:32:15 2016
New Revision: 21286

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21286
Log:
Improve #14021 fix following first patch made in r21280

Modified:
    trunk/Scribus/scribus/canvasmode.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21286&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Thu May  5 22:32:15 2016
@@ -709,13 +709,17 @@
 							p->save();
 							p->setBrush(m_brush["outline"]);
 							p->setPen(m_pen["outline"]);
-							p->translate(currItem->visualXPos(), currItem->visualYPos());
+							p->translate(currItem->xPos(), currItem->yPos());
 							p->translate(deltax, deltay);
 							if (currItem->rotation() != 0)
 							{
 								p->setRenderHint(QPainter::Antialiasing);
 								p->rotate(currItem->rotation());
 							}
+							if (currItem->isLine())
+								p->translate(0, -currItem->visualLineWidth() / 2.0);
+							else
+								p->translate(-currItem->visualLineWidth() / 2.0, -currItem->visualLineWidth() / 2.0);
 							p->scale(scalex, scaley);
 							p->drawRect(QRectF(0.0, 0.0, currItem->visualWidth(), currItem->visualHeight()));
 							p->restore();
@@ -730,7 +734,8 @@
 								p->rotate(currItem->rotation());
 							}
 							p->scale(scalex, scaley);
-							currItem->DrawPolyL(p, currItem->Clip);
+							p->drawPath(currItem->PoLine.toQPainterPath(false));
+							//currItem->DrawPolyL(p, currItem->Clip);
 							p->restore();
 						}
 					}




More information about the scribus-commit mailing list