Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better computation of computed width and height and margins for block-level

Browse Source 
elements


git-svn-id: svn://10.0.0.236/trunk@17037 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1998-12-31 05:35:38 +00:00
parent f5031101fd
commit 008a69b28f
6 changed files with 123 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/layout/generic/nsHTMLFrame.cpp
View File

@@ -167,27 +167,21 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
// Reflow our one and only child frame
if (nsnull != mFirstChild) {
// Note: the root frame does not have border or padding...
// Compute the margins around the child frame
nsMargin childMargin;
nsHTMLReflowState::ComputeMarginFor(mFirstChild, &aReflowState, childMargin);
// Compute the child frame's available space
nsSize kidMaxSize(aReflowState.maxSize.width - childMargin.left - childMargin.right,
aReflowState.maxSize.height - childMargin.top - childMargin.bottom);
nsHTMLReflowMetrics desiredSize(nsnull);
// We must pass in that the available height is unconstrained, because
// constrained is only for when we're paginated...
nsHTMLReflowState kidReflowState(aPresContext, mFirstChild, aReflowState,
nsSize(kidMaxSize.width, NS_UNCONSTRAINEDSIZE));
nsSize(aReflowState.maxSize.width, NS_UNCONSTRAINEDSIZE));
if (isChildInitialReflow) {
kidReflowState.reason = eReflowReason_Initial;
kidReflowState.reflowCommand = nsnull;
}
// For a height that's 'auto', make the frame as big as the available space
if (!kidReflowState.HaveFixedContentHeight()) {
kidReflowState.computedHeight = kidMaxSize.height;
// minus and top and bottom margins
if (NS_AUTOHEIGHT == kidReflowState.computedHeight) {
kidReflowState.computedHeight = aReflowState.maxSize.height -
kidReflowState.computedTopMargin - kidReflowState.computedTopMargin;
// Computed height is for the content area so reduce it by the amount of
// space taken up by border and padding
@@ -201,7 +195,8 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
if (NS_OK == mFirstChild->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow)) {
ReflowChild(mFirstChild, aPresContext, desiredSize, kidReflowState, aStatus);
nsRect rect(childMargin.left, childMargin.top, desiredSize.width, desiredSize.height);
nsRect rect(kidReflowState.computedLeftMargin, kidReflowState.computedTopMargin,
desiredSize.width, desiredSize.height);
mFirstChild->SetRect(rect);
// XXX We should resolve the details of who/when DidReflow()