r21204 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sun Apr 17 11:50:12 UTC 2016
Author: jghali
Date: Sun Apr 17 11:50:12 2016
New Revision: 21204
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21204
Log:
Better fix for #13646: do not break text layout when resizing text frame with drop shadow
Modified:
trunk/Scribus/scribus/pageitem.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21204&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Apr 17 11:50:12 2016
@@ -2347,6 +2347,8 @@
p->beginLayer(1.0 - m_softShadowOpacity, m_softShadowBlendMode);
if (!hasFill())
{
+ bool isEmbedded_Old = isEmbedded;
+ bool hasSoftShadow_Old = m_hasSoftShadow;
double fillTrans_Old = fillTransparency();
double lineTrans_Old = lineTransparency();
bool shadow_Old = hasSoftShadow();
@@ -2373,7 +2375,10 @@
p->endLayer();
p->restore();
}
- isEmbedded = false;
+ if (isEmbedded_Old != isEmbedded)
+ invalid = true;
+ isEmbedded = isEmbedded_Old;
+ m_hasSoftShadow = hasSoftShadow_Old;
fillTransparencyVal = fillTrans_Old;
lineTransparencyVal = lineTrans_Old;
m_rotation = rotation_Old;
More information about the scribus-commit
mailing list