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

Account for scrollbar in incremental reflow of fixed-pos elements. Bug

Browse Source 
130002, r=dbaron, sr=attinasi, a=roc+moz


git-svn-id: svn://10.0.0.236/trunk@116405 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2002-03-12 15:29:33 +00:00
parent ea8a36ff35
commit feb68c2f7a
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsViewportFrame.cpp
View File

@@ -553,8 +553,22 @@ ViewportFrame::Reflow(nsIPresContext* aPresContext,
if ((eReflowReason_Incremental == aReflowState.reason) &&
(mFixedFrames.ContainsFrame(nextFrame))) {
// Reflow the 'fixed' frame that's the next frame in the reflow path
// Calculate how much room is available for the fixed frame. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.mComputedWidth = width;
reflowState.mComputedHeight = height;
nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, aReflowState, nextFrame, PR_FALSE,
ReflowFixedFrame(aPresContext, reflowState, nextFrame, PR_FALSE,
kidStatus);
} else {

16
mozilla/layout/html/base/src/nsViewportFrame.cpp
View File

@@ -553,8 +553,22 @@ ViewportFrame::Reflow(nsIPresContext* aPresContext,
if ((eReflowReason_Incremental == aReflowState.reason) &&
(mFixedFrames.ContainsFrame(nextFrame))) {
// Reflow the 'fixed' frame that's the next frame in the reflow path
// Calculate how much room is available for the fixed frame. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.mComputedWidth = width;
reflowState.mComputedHeight = height;
nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, aReflowState, nextFrame, PR_FALSE,
ReflowFixedFrame(aPresContext, reflowState, nextFrame, PR_FALSE,
kidStatus);
} else {