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

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Lars Knoll <knoll () kde ! org>
Date:       2002-12-16 17:02:40
[Download RAW message or body]

CVS commit by knoll: 

the fix for the initial relayout problems I submitted two days ago
could break in some cases. This is the proper way of doing it
(even though we might now be doing some work twice).


  M +6 -6      render_flow.cpp   1.312


--- kdelibs/khtml/rendering/render_flow.cpp  #1.311:1.312
@@ -494,10 +494,7 @@ void RenderFlow::layoutBlockChildren( bo
         }
 
-        int chPos = xPos + child->marginLeft();
-        child->setPos(chPos, m_height);
-        if ( !child->layouted() )
-            child->layout();
-
+        child->calcWidth();
 
+        int chPos = xPos + child->marginLeft();
         if(style()->direction() == LTR) {
             // html blocks flow around floats
@@ -509,5 +506,8 @@ void RenderFlow::layoutBlockChildren( bo
                 chPos = rightOffset(m_height) - child->marginRight() - child->width();
         }
-        child->setPos(chPos, child->yPos());
+        child->setPos(chPos, m_height);
+
+        if ( !child->layouted() )
+            child->layout();
 
         m_height += child->height();


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