Commit 7c6e5520 authored by hyatt's avatar hyatt

Fix for percentage table heights. A check was missing to

	look for a fixed height on the containing block.

        Reviewed by darin

        * khtml/rendering/render_table.cpp:
        (RenderTable::layoutRows):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 595f51b4
2003-01-03 David Hyatt <hyatt@apple.com>
Fix for percentage table heights. A check was missing to
look for a fixed height on the containing block.
Reviewed by darin
* khtml/rendering/render_table.cpp:
(RenderTable::layoutRows):
=== Alexander-48 === === Alexander-48 ===
2003-01-02 David Hyatt <hyatt@apple.com> 2003-01-02 David Hyatt <hyatt@apple.com>
......
2003-01-03 David Hyatt <hyatt@apple.com>
Fix for percentage table heights. A check was missing to
look for a fixed height on the containing block.
Reviewed by darin
* khtml/rendering/render_table.cpp:
(RenderTable::layoutRows):
=== Alexander-48 === === Alexander-48 ===
2003-01-02 David Hyatt <hyatt@apple.com> 2003-01-02 David Hyatt <hyatt@apple.com>
......
...@@ -1475,15 +1475,18 @@ void RenderTable::layoutRows(int yoff) ...@@ -1475,15 +1475,18 @@ void RenderTable::layoutRows(int yoff)
} }
if (!c->isTableCell()) { if (!c->isTableCell()) {
Length ch = c->style()->height();
if (ch.isFixed())
th = h.width(ch.value);
else {
// we need to substract out the margins of this block. -dwh // we need to substract out the margins of this block. -dwh
th = h.width(viewRect().height() th = h.width(viewRect().height() - c->marginBottom() - c->marginTop());
- c->marginBottom()
- c->marginTop());
// not really, but this way the view height change // not really, but this way the view height change
// gets propagated correctly // gets propagated correctly
setOverhangingContents(); setOverhangingContents();
} }
} }
}
bool tableGrew = false; bool tableGrew = false;
if (th && totalRows) if (th && totalRows)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment