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

b=20286. Changed PlaceFloater() so that it repositions any views after

Browse Source 
placing the frame


git-svn-id: svn://10.0.0.236/trunk@54723 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-11-30 05:09:08 +00:00
parent 51881fbcea
commit 64a7b56d5e
6 changed files with 114 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4874,7 +4874,17 @@ nsBlockFrame::ReflowFloater(nsBlockReflowState& aState,
const nsHTMLReflowMetrics& metrics = brc.GetMetrics();
aCombinedRect = metrics.mCombinedArea;
// Set the rect, make sure the view is properly sized and positioned,
// and tell the frame we're done reflowing it
floater->SizeTo(aState.mPresContext, metrics.width, metrics.height);
nsIView* view;
floater->GetView(aState.mPresContext, &view);
if (view) {
nsContainerFrame::SyncFrameViewAfterReflow(aState.mPresContext, floater, view,
&metrics.mCombinedArea,
NS_FRAME_NO_MOVE_VIEW);
}
floater->DidReflow(aState.mPresContext, NS_FRAME_REFLOW_FINISHED);
// Stash away the max-element-size for later
aState.StoreMaxElementSize(floater, brc.GetMaxElementSize());
@@ -5218,7 +5228,16 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
x += aFloaterCache->mOffsets.left;
y += aFloaterCache->mOffsets.top;
}
// Position the floater and make sure and views are properly positioned
nsIView* view;
floater->MoveTo(mPresContext, x, y);
floater->GetView(mPresContext, &view);
if (view) {
nsContainerFrame::PositionFrameView(mPresContext, floater, view);
} else {
nsContainerFrame::PositionChildViews(mPresContext, floater);
}
// Update the floater combined area state
nsRect combinedArea = aFloaterCache->mCombinedArea;