r24116 by jghali - #16281: No shadows in PDF exported while setRedraw(False)

[scribus-commit]

Author: jghali
Date: Tue Oct 27 10:33:52 2020
New Revision: 24116

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24116
Log:
#16281: No shadows in PDF exported while setRedraw(False)

Modified:
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/text/screenpainter.cpp

Modified: trunk/Scribus/scribus/canvas.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24116&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp    (original)
+++ trunk/Scribus/scribus/canvas.cpp    Tue Oct 27 10:33:52 2020
@@ -809,7 +809,7 @@
 {
 //     
qDebug()<<"Canvas::paintEvent"<<p->rect()<<m_viewMode.forceRedraw<<m_viewMode.operItemSelecting;
 //     printBacktrace(62);
-       if (m_doc->isLoading())
+       if (m_doc->isLoading() || !m_doc->DoDrawing)
                return;
 // #define SHOW_ME_WHAT_YOU_GET_IN_D_CANVA
 #ifdef SHOW_ME_WHAT_YOU_GET_IN_D_CANVA

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24116&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp  (original)
+++ trunk/Scribus/scribus/pageitem.cpp  Tue Oct 27 10:33:52 2020
@@ -1593,8 +1593,6 @@
  */
 void PageItem::DrawObj(ScPainter *p, QRectF cullingArea)
 {
-       if (!m_Doc->DoDrawing)
-               return;
        // #12698: Prevent drawing of line items
        /*if (PoLine.isEmpty())
                return;*/
@@ -2077,8 +2075,6 @@
 void PageItem::DrawObj_Embedded(ScPainter *p, QRectF cullingArea, const 
CharStyle& style, PageItem* cembedded)
 {
        if (!cembedded)
-               return;
-       if (!m_Doc->DoDrawing)
                return;
        QList<PageItem*> emG;
        emG.clear();

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24116&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp      (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp      Tue Oct 27 10:33:52 2020
@@ -1070,8 +1070,6 @@
                QRect cullingArea;
                if (!embedded)
                        return;
-               if (!m_item->m_Doc->DoDrawing)
-                       return;
 
                m_painter->save();
                double pws = embedded->m_lineWidth;

Modified: trunk/Scribus/scribus/text/screenpainter.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24116&path=/trunk/Scribus/scribus/text/screenpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/text/screenpainter.cpp        (original)
+++ trunk/Scribus/scribus/text/screenpainter.cpp        Tue Oct 27 10:33:52 2020
@@ -291,8 +291,6 @@
 {
        QRectF cullingArea;
        if (!embedded)
-               return;
-       if (!m_item->m_Doc->DoDrawing)
                return;
 
        m_painter->save();


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