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

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-03-29 0:00:36
Message-ID: 20050329000036.7AA81631 () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

- rewrite the float clearing fix more efficiently
- remove the attempt at fAF relayout optimization 
 (can be wrong since even if children aren't affected by floats, the fAF
 itself might need width adjustment)


  M +5 -5      render_block.cpp   1.65


--- kdelibs/khtml/rendering/render_block.cpp  #1.64:1.65
@@ -845,12 +845,12 @@ void RenderBlock::layoutBlockChildren( b
         if ( child->flowAroundFloats() && !style()->width().isVariable()) {
             bool doClear = false;
-            if (child->minWidth() > lineWidth( m_height ))
-                doClear = true;
-            else if (child->style()->width().isPercent()) {
+            if (child->style()->width().isPercent()) {
                 int oldw = child->width();
                 child->calcWidth();
                 doClear = (child->width() > lineWidth( m_height ));
                 child->setWidth( oldw );
-            }
+            } else if (child->minWidth() > lineWidth( m_height ))
+                doClear = true;
+
             if (doClear && fb > m_height) {
                 m_height = fb;
@@ -862,5 +862,5 @@ void RenderBlock::layoutBlockChildren( b
 
         // take care in case we inherited floats
-        if (fb > m_height && !child->flowAroundFloats())
+        if (fb > m_height)
             child->setChildNeedsLayout(true);
 


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