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

Added new #define NS_SHRINKWRAPWIDTH that specifies that a frame should

Browse Source 
shrink wrap its width (paying attention to the maximum computed width). Mostly
complete implementation for block frames


git-svn-id: svn://10.0.0.236/trunk@56652 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
2000-01-03 04:32:13 +00:00
parent 499edfe3e8
commit a9936ebc11
22 changed files with 1340 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/layout/generic/nsLineLayout.cpp
View File

@@ -800,8 +800,12 @@ nsresult
nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsIFrame** aNextRCFrame,
nsReflowStatus& aReflowStatus,
nsHTMLReflowMetrics* aMetrics)
nsHTMLReflowMetrics* aMetrics,
PRBool& aPushedFrame)
{
// Initialize OUT parameter
aPushedFrame = PR_FALSE;
PerFrameData* pfd;
nsresult rv = NewPerFrameData(&pfd);
if (NS_FAILED(rv)) {
@@ -1132,6 +1136,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
}
else {
PushFrame(aFrame);
aPushedFrame = PR_TRUE;
}
}
else {
@@ -2354,8 +2359,10 @@ nsLineLayout::TrimTrailingWhiteSpace()
return 0 != deltaWidth;
}
void
nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
PRBool
nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
PRBool aAllowJustify,
PRBool aShrinkWrapWidth)
{
PerSpanData* psd = mRootSpan;
nscoord availWidth = psd->mRightEdge;
@@ -2365,7 +2372,7 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
nsFrame::ListTag(stdout, mBlockReflowState->frame);
printf(": skipping horizontal alignment in pass1 table reflow\n");
#endif
return;
return PR_TRUE;
}
availWidth -= psd->mLeftEdge;
nscoord remainingWidth = availWidth - aLineBounds.width;
@@ -2412,6 +2419,12 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
break;
}
if (0 != dx) {
// If we need to move the frames but we're shrink wrapping, then
// we need to wait until the final width is known
if (aShrinkWrapWidth) {
return PR_FALSE;
}
PerFrameData* pfd = psd->mFirstFrame;
while (nsnull != pfd) {
pfd->mBounds.x += dx;
@@ -2426,6 +2439,9 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
psd->mChangedFrameDirection = PR_TRUE;
/* Assume that all frames have been right aligned.*/
if (aShrinkWrapWidth) {
return PR_FALSE;
}
PerFrameData* pfd = psd->mFirstFrame;
PRUint32 maxX = psd->mRightEdge;
while (nsnull != pfd) {
@@ -2436,6 +2452,8 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
}
}
}
return PR_TRUE;
}
void