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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-09-26 13:46:51
Message-ID: 1127742411.460041.3305.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 464201 by ggarand:

more fixes to box-sizing for replaced elements.

cf. css/box-sizing3.html

CCBUG: 109230



 M  +2 -2      render_box.cpp  
 M  +1 -1      render_replaced.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_box.cpp #464200:464201
@@ -1056,7 +1056,7 @@
     if (width < minW)
         width = minW;
 
-    return calcContentWidth(width);
+    return width;
 }
 
 int RenderBox::calcReplacedWidthUsing(WidthType widthType) const
@@ -1098,7 +1098,7 @@
     if (height < minH)
         height = minH;
 
-    return calcContentHeight(height);
+    return height;
 }
 
 int RenderBox::calcReplacedHeightUsing(HeightType heightType) const
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_replaced.cpp #464200:464201
@@ -70,7 +70,7 @@
 #endif
 
     m_width = calcReplacedWidth();
-    m_width += paddingLeft() + paddingRight() + borderLeft() + borderRight();
+    m_width = calcBoxWidth( m_width );
 
     if ( style()->width().isPercent() || style()->height().isPercent() || 
 		    style()->maxWidth().isPercent() || style()->maxHeight().isPercent() ||
[prev in list] [next in list] [prev in thread] [next in thread]