r23148 by jghali - #15784: imported SVG containing text not rendered properly

[scribus-commit]

Author: jghali
Date: Fri Aug 23 03:39:56 2019
New Revision: 23148

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23148
Log:
#15784: imported SVG containing text not rendered properly

Modified:
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.h

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23148&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp      (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp      Fri Aug 23 
03:39:56 2019
@@ -566,13 +566,7 @@
        if (m_gc.top())
        {
                *gc = *(m_gc.top());
-               if (m_gc.top()->forGroup)
-               {
-                       gc->forGroup = false;
-                       gc->Opacity = 1.0;
-                       gc->FillOpacity = 1.0;
-                       gc->StrokeOpacity = 1.0;
-               }
+               gc->Opacity = 1.0; // opacity is not inheritable contrary to 
fill-opacity or stroke-opacity
                gc->filter.clear(); // filter is not inheritable
        }
        m_gc.push(gc);
@@ -1248,7 +1242,6 @@
        groupLevel++;
        setupNode(e);
        parseClipPathAttr(e, clipPath);
-       m_gc.top()->forGroup = true;
        int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, baseX, 
baseY, 1, 1, 0, CommonStrings::None, CommonStrings::None);
        PageItem *neu = m_Doc->Items->at(z);
        for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23148&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.h        (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.h        Fri Aug 23 
03:39:56 2019
@@ -164,7 +164,6 @@
                StrokeOpacity(1.0),
                textAnchor("start"),
                clipPath(),
-               forGroup(false),
                endMarker(""),
                startMarker("")
                {
@@ -215,7 +214,6 @@
        QString textAnchor;
        QString textDecoration;
        FPointArray clipPath;
-       bool forGroup;
        QString filter;
        QString endMarker;
        QString startMarker;


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit