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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2006-09-20 14:27:02
Message-ID: 1158762422.250615.29625.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 586756 by carewolf:

Overflow-height includes padding-bottom when overflow scrolls.
BUG: 133310


 M  +8 -3      render_block.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_block.cpp #586755:586756
@@ -711,8 +711,13 @@
     calcHeight();
     if (oldHeight != m_height) {
         // If the block got expanded in size, then increase our overflowheight to match.
-        if (m_overflowHeight > m_height)
-            m_overflowHeight -= (borderBottom()+paddingBottom());
+        if (m_overflowHeight > m_height) {
+            if (style()->scrollsOverflow())
+                // overflow-height only includes padding-bottom when it scrolls
+                m_overflowHeight -= borderBottom();
+            else
+                m_overflowHeight -= (borderBottom()+paddingBottom());
+        }
         if (m_overflowHeight < m_height)
             m_overflowHeight = m_height;
     }
@@ -1633,7 +1638,7 @@
 
     if (childrenInline())
         paintLines(pI, scrolledX, scrolledY);
-    else {            
+    else {
         for(RenderObject *child = firstChild(); child; child = child->nextSibling())
             if(!child->layer() && !child->isFloating())
                 child->paint(pI, scrolledX, scrolledY);
[prev in list] [next in list] [prev in thread] [next in thread]