r20933 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sun Feb  7 12:56:41 2016
New Revision: 20933

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20933
Log:
Fixed Part 1 of Bug #11359: Missing redraw of inline frames

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20933&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sun Feb  7 12:56:41 2016
@@ -3975,7 +3975,18 @@
 						p->setPen(cachedStrokeQ, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 				}
 				// paint glyphs
-				if (isEmbedded || cullingArea.intersects(pf2.mapRect(QRect(qRound(CurX + glyphs->xoffset),qRound(ls.y + glyphs->yoffset-asce), qRound(glyphs->xadvance+1), qRound(asce+desc)))))
+				QRectF scrGl;
+				if (itemText.hasObject(a))
+				{
+					PageItem* obj = itemText.object(a);
+					double ww = (obj->width() + obj->lineWidth()) * glyphs->scaleH;
+					double hh = (obj->height() + obj->lineWidth()) * glyphs->scaleV;
+					scrGl = QRectF(CurX, ls.y + glyphs->yoffset, ww , -hh).normalized();
+					previousWasObject = true;
+				}
+				else
+					scrGl = QRectF(CurX + glyphs->xoffset, ls.y + glyphs->yoffset - asce * glyphs->scaleV, glyphs->xadvance+1 , (asce+desc) * (glyphs->scaleV));
+				if (isEmbedded || cullingArea.intersects(pf2.mapRect(scrGl)))
 				{
 					p->save();//SA4
 					p->translate(CurX, ls.y);