mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed cases where we were not computing the table width correctly 

fixed cases where we were inappropriately portioning out
a spanning cell's min width to the columns it spanned.
This commit is contained in:
buster%netscape.com 1998-08-01 02:31:55 +00:00
Родитель 05a1471845
Коммит c024f2b0c9
10 изменённых файлов: 346 добавлений и 158 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

131
layout/html/table/src/BasicTableLayoutStrategy.cpp
Просмотреть файл

@ -30,7 +30,7 @@ NS_DEF_PTR(nsIStyleContext);
#ifdef NS_DEBUG
static PRBool gsDebug = PR_FALSE;
static PRBool gsDebug = PR_TRUE;
static PRBool gsDebugCLD = PR_FALSE;
#else
static const PRBool gsDebug = PR_FALSE;
@ -184,13 +184,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl
//availWidth = mMinTableWidth; // bump it up to the min
// Step 3 - assign the width of all proportional-width columns in the remaining space
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf ("BalanceColumnWidths with aMaxWidth = %d, availWidth = %d\n", aMaxWidth, availWidth);
printf ("\t\t specifiedTW = %d, min/maxTW = %d %d\n", specifiedTableWidth, mMinTableWidth, mMaxTableWidth);
printf ("\t\t reflow reason = %d\n", aReflowState.reason);
}
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf("\n%p: BEGIN BALANCE COLUMN WIDTHS\n", mTableFrame);
for (PRInt32 i=0; i<mNumCols; i++)
@ -200,7 +200,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl
result = BalanceProportionalColumns(aReflowState, availWidth, aMaxWidth,
specifiedTableWidth, tableIsAutoWidth);
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf("\n%p: END BALANCE COLUMN WIDTHS\n", mTableFrame);
for (PRInt32 i=0; i<mNumCols; i++)
@ -241,9 +241,10 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
}
PRInt32 numRows = mTableFrame->GetRowCount();
PRInt32 colIndex, rowIndex;
// for every column, determine it's min and max width, and keep track of the table width
for (PRInt32 colIndex = 0; colIndex<mNumCols; colIndex++)
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nscoord minColWidth = 0; // min col width factoring in table attributes
nscoord minColContentWidth = 0; // min width of the col's contents, does not take into account table attributes
@ -274,7 +275,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
PRInt32 firstRowIndex = -1;
PRInt32 maxColSpan = 1;
PRBool cellGrantingWidth=PR_TRUE;
for (PRInt32 rowIndex = 0; rowIndex<numRows; rowIndex++)
for (rowIndex = 0; rowIndex<numRows; rowIndex++)
{
nsTableCellFrame * cellFrame = mTableFrame->GetCellAt(rowIndex, colIndex);
if (nsnull==cellFrame)
@ -426,6 +427,8 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
colFrame->SetMaxColWidth(effectiveMaxColumnWidth);
colFrame->SetEffectiveMinColWidth(effectiveMinColumnWidth);
colFrame->SetEffectiveMaxColWidth(effectiveMaxColumnWidth);
// this is the default, the real adjustment happens below where we deal with colspans
colFrame->SetAdjustedMinColWidth(effectiveMinColumnWidth);
if (PR_TRUE==haveColWidth)
mTableFrame->SetColumnWidth(colIndex, specifiedFixedColWidth);
else
@ -433,15 +436,6 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
if (gsDebug)
printf ("col %d, set col width to = %d\n", colIndex, mTableFrame->GetColumnWidth(colIndex));
// add col[i] metrics to the running totals for the table min/max width
if (NS_UNCONSTRAINEDSIZE!=mMinTableWidth)
mMinTableWidth += effectiveMinColumnWidth + colInset;
if (mMinTableWidth<0)
mMinTableWidth = NS_UNCONSTRAINEDSIZE; // handle overflow
if (NS_UNCONSTRAINEDSIZE!=mMaxTableWidth)
mMaxTableWidth += effectiveMaxColumnWidth + colInset;
if (mMaxTableWidth<0)
mMaxTableWidth = NS_UNCONSTRAINEDSIZE; // handle overflow
if (PR_TRUE==hasColsAttribute)
{
minColWidthArray[colIndex] = minColWidth;
@ -479,11 +473,36 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
if (nsnull==nextColFrame)
break;
spanInfo->effectiveMaxWidthOfSpannedCols += nextColFrame->GetEffectiveMaxColWidth();
spanInfo->effectiveMinWidthOfSpannedCols += nextColFrame->GetEffectiveMinColWidth();
}
if (gsDebug) printf("effective max total = %d\n", spanInfo->effectiveMaxWidthOfSpannedCols);
if (gsDebug) printf("effective min total = %d, max total = %d\n",
spanInfo->effectiveMinWidthOfSpannedCols, spanInfo->effectiveMaxWidthOfSpannedCols);
}
nsTableColFrame *colFrame = mTableFrame->GetColFrame(colIndex);
nscoord colMinWidth = colFrame->GetMinColWidth();
// compute the spanning cell's contribution to the column min width
// this is the "adjusted" column width, used in SetTableToMinWidth
nscoord spanCellMinWidth;
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
(spanInfo->effectiveMinWidthOfSpannedCols);
if (gsDebug==PR_TRUE)
printf ("spanCellMinWidth portion = %d \n", spanCellMinWidth);
if (colMinWidth < spanCellMinWidth)
colFrame->SetAdjustedMinColWidth(spanCellMinWidth); // set the new min width for the col
}
else
{
if (colMinWidth < spanCellMinWidth)
{
spanCellMinWidth = spanInfo->cellMinWidth/spanInfo->initialColSpan;
colFrame->SetAdjustedMinColWidth(spanCellMinWidth);
}
}
// compute the spanning cell's contribution to the column max width
nscoord colMaxWidth = colFrame->GetMaxColWidth();
nscoord spanCellMaxWidth;
@ -498,11 +517,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
// make sure we're at least as big as our min
spanCellMaxWidth = PR_MAX(spanCellMaxWidth, colMinWidth);
colFrame->SetMaxColWidth(spanCellMaxWidth); // set the new max width for the col
//mMaxTableWidth += spanCellMaxWidth-colMaxWidth; // add in the col max width delta
mTableFrame->SetColumnWidth(colIndex, spanCellMaxWidth); // set the column to the new desired max width
if (gsDebug==PR_TRUE)
{
printf ("set mMaxTableWidth to %d\n", mMaxTableWidth);
printf ("for spanning cell into col %d with remaining span=%d, old max = %d, new max = %d\n",
colIndex, spanInfo->span, colMaxWidth, spanCellMaxWidth);
}
@ -531,8 +548,10 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
}
}
// now set the min and max table widths
SetMinAndMaxTableWidths();
// second, handle the COLS attribute (equal column widths)
// then, handle the COLS attribute (equal column widths)
// if there is a COLS attribute, fix up mMinTableWidth and mMaxTableWidth
if (PR_TRUE==hasColsAttribute)
{
@ -600,6 +619,53 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
return PR_TRUE;
}
void BasicTableLayoutStrategy::SetMinAndMaxTableWidths()
{
PRInt32 colIndex, rowIndex;
PRInt32 numRows = mTableFrame->GetRowCount();
nscoord colInset = mTableFrame->GetCellSpacing();
for (rowIndex = 0; rowIndex<numRows; rowIndex++)
{
nscoord rowMinWidth = colInset;
nscoord rowMaxWidth = colInset;
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nsTableCellFrame * cellFrame = mTableFrame->GetCellAt(rowIndex, colIndex);
rowMinWidth += colInset;
rowMaxWidth += colInset;
if (nsnull==cellFrame)
{ // there is no cell in this row that corresponds to this column
continue;
}
if (colIndex!=cellFrame->GetColIndex()) {
// For cells that span cols, we figured in the cell the first time we saw it
continue;
}
nsSize cellMinSize = cellFrame->GetPass1MaxElementSize();
nsSize cellMaxSize = cellFrame->GetPass1DesiredSize();
//PRInt32 colSpan = mTableFrame->GetEffectiveColSpan(colIndex, cellFrame);
if (NS_UNCONSTRAINEDSIZE!=rowMinWidth)
rowMinWidth += cellMinSize.width;
if (NS_UNCONSTRAINEDSIZE!=rowMaxWidth)
rowMaxWidth += cellMaxSize.width;
}
printf(" rowMinWidth=%d, rowMaxWidth=%d\n", rowMinWidth, rowMaxWidth);
// the largest row widths are the table widths
mMinTableWidth = PR_MAX(mMinTableWidth, rowMinWidth);
mMaxTableWidth = PR_MAX(mMaxTableWidth, rowMaxWidth);
}
// verify max of min row widths vs. sum of adjusted column min widths. bigger one wins
nscoord sumOfAdjustedColMinWidths=colInset;
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nsTableColFrame *colFrame;
mTableFrame->GetColumnFrame(colIndex, colFrame);
sumOfAdjustedColMinWidths += colFrame->GetAdjustedMinColWidth() + colInset;
}
mMinTableWidth = PR_MAX(mMinTableWidth, sumOfAdjustedColMinWidths);
printf("minTW=%d, maxTW=%d with DMCW=%d\n", mMinTableWidth, mMaxTableWidth, sumOfAdjustedColMinWidths);
}
// take the fixed space spanned by the columns in aColSpanList
// and distribute it proportionately (based on desired width)
void BasicTableLayoutStrategy::DistributeFixedSpace(nsVoidArray *aColSpanList)
@ -709,8 +775,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
PRInt32 numRows = mTableFrame->GetRowCount();
for (PRInt32 colIndex = 0; colIndex<mNumCols; colIndex++)
{
PRInt32 minColWidth = 0;
PRInt32 maxColWidth = 0;
nscoord minAdjustedColWidth = 0;
if (gsDebug==PR_TRUE) printf (" for col %d\n", colIndex);
nsTableColFrame *colFrame = mTableFrame->GetColFrame(colIndex);
@ -721,11 +786,11 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition);
if (PR_FALSE==IsFixedWidth(colPosition))
{
minColWidth = colFrame->GetMinColWidth();
mTableFrame->SetColumnWidth(colIndex, minColWidth);
minAdjustedColWidth = colFrame->GetAdjustedMinColWidth();
mTableFrame->SetColumnWidth(colIndex, minAdjustedColWidth);
if (PR_TRUE==hasColsAttribute)
{
minColWidthArray[colIndex] = minColWidth;
minColWidthArray[colIndex] = minAdjustedColWidth;
}
}
if (gsDebug==PR_TRUE)
@ -739,7 +804,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
PRInt32 numColsEffected = mNumCols;
if (NS_STYLE_TABLE_COLS_ALL!=mCols)
numColsEffected = mCols;
PRInt32 maxOfEffectedColWidths=0;
nscoord maxOfEffectedColWidths=0;
PRInt32 effectedColIndex;
// XXX need to fix this and all similar code if any fixed-width columns intersect COLS
for (effectedColIndex=0; effectedColIndex<numColsEffected; effectedColIndex++)
@ -807,6 +872,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(const nsReflowState& aR
{
// compute the spanning cell's contribution to the column min width
nscoord spanCellMinWidth;
PRBool needsExtraMinWidth = PR_FALSE;
/*
if (spanInfo->effectiveMinWidthOfSpannedCols<spanInfo->cellMinWidth)
needsExtraMinWidth = PR_TRUE;
*/
if (PR_TRUE==needsExtraMinWidth)
{
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
@ -840,6 +912,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(const nsReflowState& aR
printf (" and maxColWidth = %d\n", maxColWidth);
}
}
}
// compute the spanning cell's contribution to the column max width
@ -1319,6 +1392,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsReflowState&
{
// compute the spanning cell's contribution to the column min width
nscoord spanCellMinWidth;
PRBool needsExtraMinWidth = PR_FALSE;
/*
if (spanInfo->effectiveMinWidthOfSpannedCols<spanInfo->cellMinWidth)
needsExtraMinWidth = PR_TRUE;
*/
if (PR_TRUE==needsExtraMinWidth)
{
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
@ -1350,6 +1430,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsReflowState&
printf (" maxColWidth = %d\n", maxColWidth);
}
}
}
// compute the spanning cell's contribution to the column max width

2
layout/html/table/src/BasicTableLayoutStrategy.h
Просмотреть файл

@ -90,6 +90,8 @@ public:
*/
virtual PRBool AssignPreliminaryColumnWidths();
virtual void SetMinAndMaxTableWidths();
/** assign widths for each column that has proportional width inside a table that
* has auto width (width set by the content and available space.)
* Sets mColumnWidths as a side effect.

1
layout/html/table/src/nsTableColFrame.cpp
Просмотреть файл

@ -42,6 +42,7 @@ nsTableColFrame::nsTableColFrame(nsIContent* aContent, nsIFrame* aParentFrame)
mMinColWidth = 0;
mMaxEffectiveColWidth = 0;
mMinEffectiveColWidth = 0;
mMinAdjustedColWidth = 0;
mWidthSource = eWIDTH_SOURCE_NONE;
}

15
layout/html/table/src/nsTableColFrame.h
Просмотреть файл

@ -68,6 +68,9 @@ public:
nscoord GetEffectiveMinColWidth();
void SetEffectiveMinColWidth(nscoord aMinColWidth);
nscoord GetAdjustedMinColWidth();
void SetAdjustedMinColWidth(nscoord aMinColWidth);
PRInt32 GetWidthSource();
void SetWidthSource(PRInt32 aMinColWidth);
@ -92,6 +95,8 @@ protected:
nscoord mMaxEffectiveColWidth;
nscoord mMinEffectiveColWidth;
nscoord mMinAdjustedColWidth;
PRInt32 mWidthSource;
};
@ -136,8 +141,14 @@ inline void nsTableColFrame::SetEffectiveMaxColWidth(nscoord aMaxColWidth)
inline nscoord nsTableColFrame::GetEffectiveMinColWidth()
{ return mMinEffectiveColWidth; }
inline void nsTableColFrame::SetEffectiveMinColWidth(nscoord aMinColWidth)
{ mMinEffectiveColWidth = aMinColWidth; }
inline void nsTableColFrame::SetEffectiveMinColWidth(nscoord aMinEffectiveColWidth)
{ mMinEffectiveColWidth = aMinEffectiveColWidth; }
inline nscoord nsTableColFrame::GetAdjustedMinColWidth()
{ return mMinAdjustedColWidth; }
inline void nsTableColFrame::SetAdjustedMinColWidth(nscoord aMinAdjustedColWidth)
{ mMinAdjustedColWidth = aMinAdjustedColWidth; }
inline PRInt32 nsTableColFrame::GetWidthSource()
{ return mWidthSource; }

1
layout/html/table/src/nsTableOuterFrame.cpp
Просмотреть файл

@ -393,7 +393,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
// Initialize our local reflow state
OuterTableReflowState state(&aPresContext, aReflowState);
if (eReflowReason_Incremental == aReflowState.reason) {
IncrementalReflow(&aPresContext, state, aDesiredSize, aReflowState, aStatus);

131
layout/tables/BasicTableLayoutStrategy.cpp
Просмотреть файл

@ -30,7 +30,7 @@ NS_DEF_PTR(nsIStyleContext);
#ifdef NS_DEBUG
static PRBool gsDebug = PR_FALSE;
static PRBool gsDebug = PR_TRUE;
static PRBool gsDebugCLD = PR_FALSE;
#else
static const PRBool gsDebug = PR_FALSE;
@ -184,13 +184,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl
//availWidth = mMinTableWidth; // bump it up to the min
// Step 3 - assign the width of all proportional-width columns in the remaining space
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf ("BalanceColumnWidths with aMaxWidth = %d, availWidth = %d\n", aMaxWidth, availWidth);
printf ("\t\t specifiedTW = %d, min/maxTW = %d %d\n", specifiedTableWidth, mMinTableWidth, mMaxTableWidth);
printf ("\t\t reflow reason = %d\n", aReflowState.reason);
}
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf("\n%p: BEGIN BALANCE COLUMN WIDTHS\n", mTableFrame);
for (PRInt32 i=0; i<mNumCols; i++)
@ -200,7 +200,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl
result = BalanceProportionalColumns(aReflowState, availWidth, aMaxWidth,
specifiedTableWidth, tableIsAutoWidth);
if (PR_TRUE==gsDebug)
//if (PR_TRUE==gsDebug)
{
printf("\n%p: END BALANCE COLUMN WIDTHS\n", mTableFrame);
for (PRInt32 i=0; i<mNumCols; i++)
@ -241,9 +241,10 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
}
PRInt32 numRows = mTableFrame->GetRowCount();
PRInt32 colIndex, rowIndex;
// for every column, determine it's min and max width, and keep track of the table width
for (PRInt32 colIndex = 0; colIndex<mNumCols; colIndex++)
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nscoord minColWidth = 0; // min col width factoring in table attributes
nscoord minColContentWidth = 0; // min width of the col's contents, does not take into account table attributes
@ -274,7 +275,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
PRInt32 firstRowIndex = -1;
PRInt32 maxColSpan = 1;
PRBool cellGrantingWidth=PR_TRUE;
for (PRInt32 rowIndex = 0; rowIndex<numRows; rowIndex++)
for (rowIndex = 0; rowIndex<numRows; rowIndex++)
{
nsTableCellFrame * cellFrame = mTableFrame->GetCellAt(rowIndex, colIndex);
if (nsnull==cellFrame)
@ -426,6 +427,8 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
colFrame->SetMaxColWidth(effectiveMaxColumnWidth);
colFrame->SetEffectiveMinColWidth(effectiveMinColumnWidth);
colFrame->SetEffectiveMaxColWidth(effectiveMaxColumnWidth);
// this is the default, the real adjustment happens below where we deal with colspans
colFrame->SetAdjustedMinColWidth(effectiveMinColumnWidth);
if (PR_TRUE==haveColWidth)
mTableFrame->SetColumnWidth(colIndex, specifiedFixedColWidth);
else
@ -433,15 +436,6 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
if (gsDebug)
printf ("col %d, set col width to = %d\n", colIndex, mTableFrame->GetColumnWidth(colIndex));
// add col[i] metrics to the running totals for the table min/max width
if (NS_UNCONSTRAINEDSIZE!=mMinTableWidth)
mMinTableWidth += effectiveMinColumnWidth + colInset;
if (mMinTableWidth<0)
mMinTableWidth = NS_UNCONSTRAINEDSIZE; // handle overflow
if (NS_UNCONSTRAINEDSIZE!=mMaxTableWidth)
mMaxTableWidth += effectiveMaxColumnWidth + colInset;
if (mMaxTableWidth<0)
mMaxTableWidth = NS_UNCONSTRAINEDSIZE; // handle overflow
if (PR_TRUE==hasColsAttribute)
{
minColWidthArray[colIndex] = minColWidth;
@ -479,11 +473,36 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
if (nsnull==nextColFrame)
break;
spanInfo->effectiveMaxWidthOfSpannedCols += nextColFrame->GetEffectiveMaxColWidth();
spanInfo->effectiveMinWidthOfSpannedCols += nextColFrame->GetEffectiveMinColWidth();
}
if (gsDebug) printf("effective max total = %d\n", spanInfo->effectiveMaxWidthOfSpannedCols);
if (gsDebug) printf("effective min total = %d, max total = %d\n",
spanInfo->effectiveMinWidthOfSpannedCols, spanInfo->effectiveMaxWidthOfSpannedCols);
}
nsTableColFrame *colFrame = mTableFrame->GetColFrame(colIndex);
nscoord colMinWidth = colFrame->GetMinColWidth();
// compute the spanning cell's contribution to the column min width
// this is the "adjusted" column width, used in SetTableToMinWidth
nscoord spanCellMinWidth;
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
(spanInfo->effectiveMinWidthOfSpannedCols);
if (gsDebug==PR_TRUE)
printf ("spanCellMinWidth portion = %d \n", spanCellMinWidth);
if (colMinWidth < spanCellMinWidth)
colFrame->SetAdjustedMinColWidth(spanCellMinWidth); // set the new min width for the col
}
else
{
if (colMinWidth < spanCellMinWidth)
{
spanCellMinWidth = spanInfo->cellMinWidth/spanInfo->initialColSpan;
colFrame->SetAdjustedMinColWidth(spanCellMinWidth);
}
}
// compute the spanning cell's contribution to the column max width
nscoord colMaxWidth = colFrame->GetMaxColWidth();
nscoord spanCellMaxWidth;
@ -498,11 +517,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
// make sure we're at least as big as our min
spanCellMaxWidth = PR_MAX(spanCellMaxWidth, colMinWidth);
colFrame->SetMaxColWidth(spanCellMaxWidth); // set the new max width for the col
//mMaxTableWidth += spanCellMaxWidth-colMaxWidth; // add in the col max width delta
mTableFrame->SetColumnWidth(colIndex, spanCellMaxWidth); // set the column to the new desired max width
if (gsDebug==PR_TRUE)
{
printf ("set mMaxTableWidth to %d\n", mMaxTableWidth);
printf ("for spanning cell into col %d with remaining span=%d, old max = %d, new max = %d\n",
colIndex, spanInfo->span, colMaxWidth, spanCellMaxWidth);
}
@ -531,8 +548,10 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
}
}
// now set the min and max table widths
SetMinAndMaxTableWidths();
// second, handle the COLS attribute (equal column widths)
// then, handle the COLS attribute (equal column widths)
// if there is a COLS attribute, fix up mMinTableWidth and mMaxTableWidth
if (PR_TRUE==hasColsAttribute)
{
@ -600,6 +619,53 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
return PR_TRUE;
}
void BasicTableLayoutStrategy::SetMinAndMaxTableWidths()
{
PRInt32 colIndex, rowIndex;
PRInt32 numRows = mTableFrame->GetRowCount();
nscoord colInset = mTableFrame->GetCellSpacing();
for (rowIndex = 0; rowIndex<numRows; rowIndex++)
{
nscoord rowMinWidth = colInset;
nscoord rowMaxWidth = colInset;
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nsTableCellFrame * cellFrame = mTableFrame->GetCellAt(rowIndex, colIndex);
rowMinWidth += colInset;
rowMaxWidth += colInset;
if (nsnull==cellFrame)
{ // there is no cell in this row that corresponds to this column
continue;
}
if (colIndex!=cellFrame->GetColIndex()) {
// For cells that span cols, we figured in the cell the first time we saw it
continue;
}
nsSize cellMinSize = cellFrame->GetPass1MaxElementSize();
nsSize cellMaxSize = cellFrame->GetPass1DesiredSize();
//PRInt32 colSpan = mTableFrame->GetEffectiveColSpan(colIndex, cellFrame);
if (NS_UNCONSTRAINEDSIZE!=rowMinWidth)
rowMinWidth += cellMinSize.width;
if (NS_UNCONSTRAINEDSIZE!=rowMaxWidth)
rowMaxWidth += cellMaxSize.width;
}
printf(" rowMinWidth=%d, rowMaxWidth=%d\n", rowMinWidth, rowMaxWidth);
// the largest row widths are the table widths
mMinTableWidth = PR_MAX(mMinTableWidth, rowMinWidth);
mMaxTableWidth = PR_MAX(mMaxTableWidth, rowMaxWidth);
}
// verify max of min row widths vs. sum of adjusted column min widths. bigger one wins
nscoord sumOfAdjustedColMinWidths=colInset;
for (colIndex = 0; colIndex<mNumCols; colIndex++)
{
nsTableColFrame *colFrame;
mTableFrame->GetColumnFrame(colIndex, colFrame);
sumOfAdjustedColMinWidths += colFrame->GetAdjustedMinColWidth() + colInset;
}
mMinTableWidth = PR_MAX(mMinTableWidth, sumOfAdjustedColMinWidths);
printf("minTW=%d, maxTW=%d with DMCW=%d\n", mMinTableWidth, mMaxTableWidth, sumOfAdjustedColMinWidths);
}
// take the fixed space spanned by the columns in aColSpanList
// and distribute it proportionately (based on desired width)
void BasicTableLayoutStrategy::DistributeFixedSpace(nsVoidArray *aColSpanList)
@ -709,8 +775,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
PRInt32 numRows = mTableFrame->GetRowCount();
for (PRInt32 colIndex = 0; colIndex<mNumCols; colIndex++)
{
PRInt32 minColWidth = 0;
PRInt32 maxColWidth = 0;
nscoord minAdjustedColWidth = 0;
if (gsDebug==PR_TRUE) printf (" for col %d\n", colIndex);
nsTableColFrame *colFrame = mTableFrame->GetColFrame(colIndex);
@ -721,11 +786,11 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition);
if (PR_FALSE==IsFixedWidth(colPosition))
{
minColWidth = colFrame->GetMinColWidth();
mTableFrame->SetColumnWidth(colIndex, minColWidth);
minAdjustedColWidth = colFrame->GetAdjustedMinColWidth();
mTableFrame->SetColumnWidth(colIndex, minAdjustedColWidth);
if (PR_TRUE==hasColsAttribute)
{
minColWidthArray[colIndex] = minColWidth;
minColWidthArray[colIndex] = minAdjustedColWidth;
}
}
if (gsDebug==PR_TRUE)
@ -739,7 +804,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth()
PRInt32 numColsEffected = mNumCols;
if (NS_STYLE_TABLE_COLS_ALL!=mCols)
numColsEffected = mCols;
PRInt32 maxOfEffectedColWidths=0;
nscoord maxOfEffectedColWidths=0;
PRInt32 effectedColIndex;
// XXX need to fix this and all similar code if any fixed-width columns intersect COLS
for (effectedColIndex=0; effectedColIndex<numColsEffected; effectedColIndex++)
@ -807,6 +872,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(const nsReflowState& aR
{
// compute the spanning cell's contribution to the column min width
nscoord spanCellMinWidth;
PRBool needsExtraMinWidth = PR_FALSE;
/*
if (spanInfo->effectiveMinWidthOfSpannedCols<spanInfo->cellMinWidth)
needsExtraMinWidth = PR_TRUE;
*/
if (PR_TRUE==needsExtraMinWidth)
{
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
@ -840,6 +912,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(const nsReflowState& aR
printf (" and maxColWidth = %d\n", maxColWidth);
}
}
}
// compute the spanning cell's contribution to the column max width
@ -1319,6 +1392,13 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsReflowState&
{
// compute the spanning cell's contribution to the column min width
nscoord spanCellMinWidth;
PRBool needsExtraMinWidth = PR_FALSE;
/*
if (spanInfo->effectiveMinWidthOfSpannedCols<spanInfo->cellMinWidth)
needsExtraMinWidth = PR_TRUE;
*/
if (PR_TRUE==needsExtraMinWidth)
{
if (0!=spanInfo->effectiveMinWidthOfSpannedCols)
{
spanCellMinWidth = (spanInfo->cellMinWidth * colFrame->GetEffectiveMinColWidth()) /
@ -1350,6 +1430,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsReflowState&
printf (" maxColWidth = %d\n", maxColWidth);
}
}
}
// compute the spanning cell's contribution to the column max width

2
layout/tables/BasicTableLayoutStrategy.h
Просмотреть файл

@ -90,6 +90,8 @@ public:
*/
virtual PRBool AssignPreliminaryColumnWidths();
virtual void SetMinAndMaxTableWidths();
/** assign widths for each column that has proportional width inside a table that
* has auto width (width set by the content and available space.)
* Sets mColumnWidths as a side effect.

1
layout/tables/nsTableColFrame.cpp
Просмотреть файл

@ -42,6 +42,7 @@ nsTableColFrame::nsTableColFrame(nsIContent* aContent, nsIFrame* aParentFrame)
mMinColWidth = 0;
mMaxEffectiveColWidth = 0;
mMinEffectiveColWidth = 0;
mMinAdjustedColWidth = 0;
mWidthSource = eWIDTH_SOURCE_NONE;
}

15
layout/tables/nsTableColFrame.h
Просмотреть файл

@ -68,6 +68,9 @@ public:
nscoord GetEffectiveMinColWidth();
void SetEffectiveMinColWidth(nscoord aMinColWidth);
nscoord GetAdjustedMinColWidth();
void SetAdjustedMinColWidth(nscoord aMinColWidth);
PRInt32 GetWidthSource();
void SetWidthSource(PRInt32 aMinColWidth);
@ -92,6 +95,8 @@ protected:
nscoord mMaxEffectiveColWidth;
nscoord mMinEffectiveColWidth;
nscoord mMinAdjustedColWidth;
PRInt32 mWidthSource;
};
@ -136,8 +141,14 @@ inline void nsTableColFrame::SetEffectiveMaxColWidth(nscoord aMaxColWidth)
inline nscoord nsTableColFrame::GetEffectiveMinColWidth()
{ return mMinEffectiveColWidth; }
inline void nsTableColFrame::SetEffectiveMinColWidth(nscoord aMinColWidth)
{ mMinEffectiveColWidth = aMinColWidth; }
inline void nsTableColFrame::SetEffectiveMinColWidth(nscoord aMinEffectiveColWidth)
{ mMinEffectiveColWidth = aMinEffectiveColWidth; }
inline nscoord nsTableColFrame::GetAdjustedMinColWidth()
{ return mMinAdjustedColWidth; }
inline void nsTableColFrame::SetAdjustedMinColWidth(nscoord aMinAdjustedColWidth)
{ mMinAdjustedColWidth = aMinAdjustedColWidth; }
inline PRInt32 nsTableColFrame::GetWidthSource()
{ return mWidthSource; }

1
layout/tables/nsTableOuterFrame.cpp
Просмотреть файл

@ -393,7 +393,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
// Initialize our local reflow state
OuterTableReflowState state(&aPresContext, aReflowState);
if (eReflowReason_Incremental == aReflowState.reason) {
IncrementalReflow(&aPresContext, state, aDesiredSize, aReflowState, aStatus);