r18052 by fschmid - Fixed Bug #11328: Inline frame should be visible when "display frames" is set

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 5 11:56:03 UTC 2013


Author: fschmid
Date: Sat Jan  5 11:56:03 2013
New Revision: 18052

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18052
Log:
Fixed Bug #11328: Inline frame should be visible when "display frames" is set

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18052&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Jan  5 11:56:03 2013
@@ -2140,6 +2140,18 @@
 		p->restore();
 		embedded->m_lineWidth = pws;
 	}
+	if (m_Doc->guidesPrefs().framesShown)
+	{
+		p->save();
+		p->translate(0, -(cembedded->Height * (style.scaleV() / 1000.0)));
+		if (style.baselineOffset() != 0)
+			p->translate(0, -cembedded->Height * (style.baselineOffset() / 1000.0));
+		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
+		p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor, 0, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
+		p->setFillMode(ScPainter::None);
+		p->drawSharpRect(0, 0, cembedded->Width, cembedded->Height);
+		p->restore();
+	}
 }
 
 void PageItem::DrawStrokePattern(ScPainter *p, QPainterPath &path)




More information about the scribus-commit mailing list