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

Fix for bug #10395. Now we recalculate margins when we use the minimum or

Browse Source 
maximum value for the computed width/height. This applies to positioned
elements only


git-svn-id: svn://10.0.0.236/trunk@41181 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-07-27 00:48:47 +00:00
parent 82f32d054d
commit 6b27e8cd0c
4 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/layout/html/base/src/nsAbsoluteContainingBlock.cpp
View File

@@ -169,8 +169,6 @@ nsAbsoluteContainingBlock::IncrementalReflow(nsIFrame* aDelegatin
if (isAbsoluteChild) {
nsIReflowCommand::ReflowType type;
nsIFrame* newFrames;
PRInt32 numFrames = 0;
// Get the type of reflow command
aReflowState.reflowCommand->GetType(type);
@@ -187,7 +185,7 @@ nsAbsoluteContainingBlock::IncrementalReflow(nsIFrame* aDelegatin
if (frameState & NS_FRAME_IS_DIRTY) {
nsReflowStatus status;
ReflowAbsoluteFrame(aDelegatingFrame, aPresContext, aReflowState,
newFrames, PR_TRUE, status);
f, PR_TRUE, status);
}
}
@@ -263,8 +261,21 @@ nsAbsoluteContainingBlock::ReflowAbsoluteFrame(nsIFrame* aDelegat
rv = htmlReflow->Reflow(aPresContext, kidDesiredSize, kidReflowState, aStatus);
// Because we don't know the size of a replaced element until after we reflow
// it 'auto' margins must be computed now
// it 'auto' margins must be computed now, and we need to take into account
// min-max information
if (NS_FRAME_IS_REPLACED(kidReflowState.mFrameType)) {
// Factor in any minimum and maximum size information
if (kidDesiredSize.width > kidReflowState.mComputedMaxWidth) {
kidDesiredSize.width = kidReflowState.mComputedMaxWidth;
} else if (kidDesiredSize.width < kidReflowState.mComputedMinWidth) {
kidDesiredSize.width = kidReflowState.mComputedMinWidth;
}
if (kidDesiredSize.height > kidReflowState.mComputedMaxHeight) {
kidDesiredSize.height = kidReflowState.mComputedMaxHeight;
} else if (kidDesiredSize.height < kidReflowState.mComputedMinHeight) {
kidDesiredSize.height = kidReflowState.mComputedMinHeight;
}
// Get the containing block width/height
nscoord containingBlockWidth, containingBlockHeight;
kidReflowState.ComputeContainingBlockRectangle(&aReflowState,