[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/khtml/rendering
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-01-26 1:56:59
Message-ID: 20040126015659.CDBDE8FEA () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

* rendering/render_canvas.cpp (layout): don't recurse when printing (#72775). (backport revision 1.145)


  M +12 -10    render_canvas.cpp   1.144.2.1


--- kdelibs/khtml/rendering/render_canvas.cpp  #1.144:1.144.2.1
@@ -141,4 +142,7 @@ void RenderCanvas::layout()
     qt.start();
 #endif
+    KHTMLView::ScrollBarMode vsmode = m_view->vScrollBarMode();
+    KHTMLView::ScrollBarMode hsmode = m_view->hScrollBarMode();
+
     if (!m_printingMode) {
         QSize s = m_view->viewportSize(m_view->contentsWidth(),
@@ -146,12 +150,4 @@ void RenderCanvas::layout()
         m_viewportWidth = m_width = s.width();
         m_viewportHeight = m_height = s.height();
-    }
-    else {
-        m_width = m_rootWidth;
-        m_height = m_rootHeight;
-    }
-    
-    KHTMLView::ScrollBarMode vsmode = m_view->vScrollBarMode();
-    KHTMLView::ScrollBarMode hsmode = m_view->hScrollBarMode();
     
     if (m_view->verticalScrollBar()->isVisible())
@@ -164,5 +160,9 @@ void RenderCanvas::layout()
     else
         m_view->setHScrollBarMode(KHTMLView::AlwaysOff);
-
+    }
+    else {
+        m_width = m_rootWidth;
+        m_height = m_rootHeight;
+    }
 
     RenderBlock::layout();
@@ -191,6 +191,8 @@ void RenderCanvas::layout()
     layer()->resize( kMax( docW,int( m_width ) ), kMax( docH,m_height ) );
 
-    m_view->setVScrollBarMode(vsmode);
+    if ( !m_printingMode ) {
     m_view->setHScrollBarMode(hsmode);
+        m_view->setVScrollBarMode(vsmode);
+    }
 
     setLayouted();


[prev in list] [next in list] [prev in thread] [next in thread]