Make the header overlap the footer in the zero-line case. Changes to Emerson's...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Aug 2004 00:15:47 +0000 (00:15 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Aug 2004 00:15:47 +0000 (00:15 +0000)
header draws over the footer.

        Reviewed by darin

        * khtml/rendering/render_block.cpp:
        (khtml::getHeightForLineCount):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_block.cpp

index dc45de0dc676e8f63742cd4c4b6c9cdf75d251dd..2698a15acae71bce2b407626065f0e259304bd5c 100644 (file)
@@ -1,3 +1,13 @@
+2004-08-18  David Hyatt  <hyatt@apple.com>
+
+       Make the header overlap the footer in the zero-line case.  Changes to Emerson's template will ensure the
+       header draws over the footer.
+       
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::getHeightForLineCount):
+
 2004-08-18  Richard Williamson   <rjw@apple.com>
 
         Replace horrible pollForAppletInView: with new
index e58860ac00663b680f21d41475cb4672c2de8616..21f9676534d07b30de46974d93058b3a9895522d 100644 (file)
@@ -2892,8 +2892,7 @@ int getHeightForLineCount(RenderBlock* block, int l, bool includeBottom, int& co
                     normalFlowChildWithoutLines = obj;
             }
             if (normalFlowChildWithoutLines && l == 0)
-                return normalFlowChildWithoutLines->yPos() + normalFlowChildWithoutLines->height() + 
-                    (includeBottom ? (block->borderBottom() + block->paddingBottom()) : 0);
+                return normalFlowChildWithoutLines->yPos() + normalFlowChildWithoutLines->height();
         }
     }