From b6636b035effee12187eb24a26ffb0776e9137ce Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Tue, 1 Feb 2005 01:21:25 +0000 Subject: [PATCH] Bug 277355. Make columns get the right containing block width and height. r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@168604 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsColumnSetFrame.cpp | 3 ++- mozilla/layout/style/ua.css | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/layout/generic/nsColumnSetFrame.cpp b/mozilla/layout/generic/nsColumnSetFrame.cpp index 3e74faf359d..e808bce9b74 100644 --- a/mozilla/layout/generic/nsColumnSetFrame.cpp +++ b/mozilla/layout/generic/nsColumnSetFrame.cpp @@ -432,7 +432,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize, } nsHTMLReflowState kidReflowState(GetPresContext(), aReflowState, child, - availSize, tmpReason); + availSize, availSize.width, + aReflowState.mComputedHeight, tmpReason); #ifdef DEBUG_roc printf("*** Reflowing child #%d %p: reason = %d, availHeight=%d\n", diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css index ad1d4f8d115..dae1f176d45 100644 --- a/mozilla/layout/style/ua.css +++ b/mozilla/layout/style/ua.css @@ -153,6 +153,11 @@ /* the column boxes inside a column-flowed block */ /* make unicode-bidi inherit, otherwise it has no effect on column boxes */ unicode-bidi: inherit; + /* inherit the outer frame's display, otherwise we turn into an inline */ + display: inherit !important; + /* Carry through our parent's height so that %-height children get + their heights set */ + height: 100%; } *|*::-moz-page, *|*::-moz-page-sequence {