r21222 by fschmid -
scribus-commit
scribus-commit at lists.scribus.net
Fri Apr 22 19:59:54 UTC 2016
Author: fschmid
Date: Fri Apr 22 19:59:53 2016
New Revision: 21222
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21222
Log:
Fixed Bug #13973: mesh distortion for outlined text
Modified:
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21222&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp Fri Apr 22 19:59:53 2016
@@ -125,6 +125,11 @@
if (dia->exec())
{
dia->updateAndExit();
+ if (m_patternItem->isGroup())
+ {
+ m_doc->resizeGroupToContents(m_patternItem);
+ m_patternItem->SetRectFrame();
+ }
m_doc->changed();
m_doc->view()->DrawNew();
}
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21222&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp Fri Apr 22 19:59:53 2016
@@ -552,6 +552,7 @@
{
currItem->groupWidth = currItem->groupWidth * (currItem->OldB2 / oW);
currItem->groupHeight = currItem->groupHeight * (currItem->OldH2 / oH);
+ currItem->SetRectFrame();
}
currItem->updateClip();
currItem->ContourLine = currItem->PoLine.copy();
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21222&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp Fri Apr 22 19:59:53 2016
@@ -231,6 +231,12 @@
{
updateEffectG(dia->effectType, dia->offset, dia->offsetY, dia->gap, dia->rotate);
m_doc->changed();
+ if (bxi->isGroup())
+ {
+ m_doc->resizeGroupToContents(bxi);
+ bxi->SetRectFrame();
+ m_doc->view()->DrawNew();
+ }
}
else
{
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21222&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp Fri Apr 22 19:59:53 2016
@@ -28,6 +28,7 @@
#include "lensdialog.h"
#include "scribuscore.h"
#include "selection.h"
+#include "scribusview.h"
int lenseffects_getPluginAPIVersion()
{
@@ -139,9 +140,24 @@
currItem->groupHeight = currItem->groupHeight * (currItem->OldH2 / oH);
}
currItem->updateClip();
+ if (currItem->isGroup())
+ {
+ currDoc->resizeGroupToContents(currItem);
+ currItem->SetRectFrame();
+ }
currItem->ContourLine = currItem->PoLine.copy();
}
+ if (currDoc->m_Selection->count() > 0)
+ {
+ PageItem *m_patternItem = currDoc->m_Selection->itemAt(0);
+ if (m_patternItem->isGroup())
+ {
+ currDoc->resizeGroupToContents(m_patternItem);
+ m_patternItem->SetRectFrame();
+ }
+ }
currDoc->changed();
+ currDoc->view()->DrawNew();
}
delete dia;
}
More information about the scribus-commit
mailing list