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

cells no longer monkey with their available width based on attribute constraints. 

The row does this work now. This makes table layout more properly top-down.
This commit is contained in:
buster 1998-06-29 20:38:22 +00:00
Родитель 5f267145ec
Коммит a5505b8275
4 изменённых файлов: 22 добавлений и 74 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -267,42 +267,6 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
CreatePsuedoFrame(aPresContext);
}
// Determine the width we have to work with
nscoord cellWidth = -1;
const nsStylePosition* cellPosition = (const nsStylePosition*)
(mStyleContext->GetStyleData(eStyleStruct_Position));
switch (cellPosition->mWidth.GetUnit()) {
case eStyleUnit_Coord:
cellWidth = cellPosition->mWidth.GetCoordValue();
break;
case eStyleUnit_Percent:
{
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
{
nscoord tableWidth=0;
const nsReflowState *tableReflowState = aReflowState.parentReflowState->parentReflowState->parentReflowState;
nsTableFrame *tableFrame = (nsTableFrame *)(tableReflowState->frame);
nsIStyleContextPtr tableSC;
tableFrame->GetStyleContext(aPresContext, tableSC.AssignRef());
PRBool tableIsAutoWidth = nsTableFrame::TableIsAutoWidth(tableFrame, tableSC, *tableReflowState, tableWidth);
float percent = cellPosition->mWidth.GetPercentValue();
cellWidth = (PRInt32)(tableWidth*percent);
}
break;
}
case eStyleUnit_Inherit:
// XXX for now, do nothing
default:
case eStyleUnit_Auto:
break;
}
if (-1!=cellWidth)
availSize.width = cellWidth;
// reduce available space by insets
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
@ -366,10 +330,11 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
printf(" %p cellFrame height set to %d from kidSize=%d and insets %d,%d\n",
this, cellHeight, kidSize.height, topInset, bottomInset);
// next determine the cell's width
cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
nscoord cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
if (NS_UNCONSTRAINEDSIZE!=cellWidth)
cellWidth += leftInset + rightInset;
// Nav4 hack for 0 width cells. If the cell has any content, it must have a desired width of at least 1
/*
if (0==cellWidth)
{
PRInt32 childCount;
@ -387,6 +352,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
}
}
}
*/
// end Nav4 hack for 0 width cells
// set the cell's desired size and max element size

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

@ -963,6 +963,14 @@ nsTableRowFrame::ReflowUnmappedChildren( nsIPresContext* aPresContext,
kidPrevInFlow->CreateContinuingFrame(aPresContext, this,
kidStyleContext, kidFrame);
}
// Determine the width we have to work with. By default, it's unconstrained
const nsStylePosition* cellPosition = (const nsStylePosition*)
(kidStyleContext->GetStyleData(eStyleStruct_Position));
if (eStyleUnit_Coord==cellPosition->mWidth.GetUnit())
{
kidAvailSize.width = cellPosition->mWidth.GetCoordValue();
}
// free the kid's style context
NS_RELEASE(kidStyleContext);

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

@ -267,42 +267,6 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
CreatePsuedoFrame(aPresContext);
}
// Determine the width we have to work with
nscoord cellWidth = -1;
const nsStylePosition* cellPosition = (const nsStylePosition*)
(mStyleContext->GetStyleData(eStyleStruct_Position));
switch (cellPosition->mWidth.GetUnit()) {
case eStyleUnit_Coord:
cellWidth = cellPosition->mWidth.GetCoordValue();
break;
case eStyleUnit_Percent:
{
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
{
nscoord tableWidth=0;
const nsReflowState *tableReflowState = aReflowState.parentReflowState->parentReflowState->parentReflowState;
nsTableFrame *tableFrame = (nsTableFrame *)(tableReflowState->frame);
nsIStyleContextPtr tableSC;
tableFrame->GetStyleContext(aPresContext, tableSC.AssignRef());
PRBool tableIsAutoWidth = nsTableFrame::TableIsAutoWidth(tableFrame, tableSC, *tableReflowState, tableWidth);
float percent = cellPosition->mWidth.GetPercentValue();
cellWidth = (PRInt32)(tableWidth*percent);
}
break;
}
case eStyleUnit_Inherit:
// XXX for now, do nothing
default:
case eStyleUnit_Auto:
break;
}
if (-1!=cellWidth)
availSize.width = cellWidth;
// reduce available space by insets
if (NS_UNCONSTRAINEDSIZE!=availSize.width)
@ -366,10 +330,11 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
printf(" %p cellFrame height set to %d from kidSize=%d and insets %d,%d\n",
this, cellHeight, kidSize.height, topInset, bottomInset);
// next determine the cell's width
cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
nscoord cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
if (NS_UNCONSTRAINEDSIZE!=cellWidth)
cellWidth += leftInset + rightInset;
// Nav4 hack for 0 width cells. If the cell has any content, it must have a desired width of at least 1
/*
if (0==cellWidth)
{
PRInt32 childCount;
@ -387,6 +352,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
}
}
}
*/
// end Nav4 hack for 0 width cells
// set the cell's desired size and max element size

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

@ -963,6 +963,14 @@ nsTableRowFrame::ReflowUnmappedChildren( nsIPresContext* aPresContext,
kidPrevInFlow->CreateContinuingFrame(aPresContext, this,
kidStyleContext, kidFrame);
}
// Determine the width we have to work with. By default, it's unconstrained
const nsStylePosition* cellPosition = (const nsStylePosition*)
(kidStyleContext->GetStyleData(eStyleStruct_Position));
if (eStyleUnit_Coord==cellPosition->mWidth.GetUnit())
{
kidAvailSize.width = cellPosition->mWidth.GetCoordValue();
}
// free the kid's style context
NS_RELEASE(kidStyleContext);