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

fixed some nested table bugs and made some minor adjustments to Kipp's new line layout code.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@4550 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
buster
1998-06-26 00:48:44 +00:00
parent b23516e974
commit 9c71826ed6
8 changed files with 232 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/tables/nsTableCellFrame.cpp
View File

@@ -259,13 +259,6 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
nsTableFrame* tableFrame = GetTableFrame();
tableFrame->GetCellMarginData(this,margin);
// reduce available space by insets
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
availSize.width -= leftInset+rightInset+margin.left+margin.right;
if (NS_UNCONSTRAINEDSIZE!=availSize.height)
availSize.height -= topInset+bottomInset+margin.top+margin.bottom;
mLastContentIsComplete = PR_TRUE;
// get frame, creating one if needed
@@ -276,11 +269,10 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
// Determine the width we have to work with
nscoord cellWidth = -1;
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
//if (NS_UNCONSTRAINEDSIZE!=availSize.width)
{
/*
nsStylePosition* kidPosition = (nsStylePosition*)
mStyleContext->GetData(eStyleStruct_Position);
const nsStylePosition* kidPosition = (const nsStylePosition*)
(mStyleContext->GetStyleData(eStyleStruct_Position));
switch (kidPosition->mWidth.GetUnit()) {
case eStyleUnit_Coord:
cellWidth = kidPosition->mWidth.GetCoordValue();
@@ -305,11 +297,17 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
case eStyleUnit_Auto:
break;
}
*/
if (-1!=cellWidth)
availSize.width = cellWidth;
}
// reduce available space by insets
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
availSize.width -= leftInset+rightInset+margin.left+margin.right;
if (NS_UNCONSTRAINEDSIZE!=availSize.height)
availSize.height -= topInset+bottomInset+margin.top+margin.bottom;
// Try to reflow the child into the available space. It might not
// fit or might need continuing.
if (availSize.height < 0)