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

PDT+ bug 27124 - correctly handle child frames that are not row groups. r=troy, a=rickg

This commit is contained in:
karnaze%netscape.com 2000-02-27 22:36:42 +00:00
Родитель 9fe3a0a9db
Коммит f9cba72cb7
2 изменённых файлов: 34 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1377,6 +1377,9 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
// Move the frames that follow aKidFrame by aDeltaY, and update the running // Move the frames that follow aKidFrame by aDeltaY, and update the running
// y-offset // y-offset
for (aKidFrame->GetNextSibling(&kidFrame); kidFrame; kidFrame->GetNextSibling(&kidFrame)) { for (aKidFrame->GetNextSibling(&kidFrame); kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(kidFrame);
if (!rgFrame) continue; // skip foreign frames
// See if it's the footer we're moving // See if it's the footer we're moving
if (kidFrame == aReflowState.footerFrame) { if (kidFrame == aReflowState.footerFrame) {
movedFooter = PR_TRUE; movedFooter = PR_TRUE;
@ -1390,8 +1393,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
// Update the max element size // Update the max element size
//XXX: this should call into layout strategy to get the width field //XXX: this should call into layout strategy to get the width field
if (aMaxElementSize) if (aMaxElementSize) {
{
const nsStyleSpacing* tableSpacing; const nsStyleSpacing* tableSpacing;
GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)tableSpacing)); GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)tableSpacing));
nsMargin borderPadding; nsMargin borderPadding;
@ -1399,7 +1401,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
borderPadding += aReflowState.reflowState.mComputedPadding; borderPadding += aReflowState.reflowState.mComputedPadding;
nscoord cellSpacing = GetCellSpacingX(); nscoord cellSpacing = GetCellSpacingX();
nsSize kidMaxElementSize; nsSize kidMaxElementSize;
((nsTableRowGroupFrame*)kidFrame)->GetMaxElementSize(kidMaxElementSize); rgFrame->GetMaxElementSize(kidMaxElementSize);
nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2; nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2;
aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth); aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth);
aMaxElementSize->height += kidMaxElementSize.height; aMaxElementSize->height += kidMaxElementSize.height;
@ -1926,7 +1928,6 @@ NS_METHOD nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext,
borderPadding += aReflowState.mComputedPadding; borderPadding += aReflowState.mComputedPadding;
InnerTableReflowState state(aPresContext, aReflowState, borderPadding); InnerTableReflowState state(aPresContext, aReflowState, borderPadding);
// now that we've computed the column width information, reflow all children // now that we've computed the column width information, reflow all children
#ifdef NS_DEBUG #ifdef NS_DEBUG
@ -2596,34 +2597,37 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
nsSize* aMaxElementSize) nsSize* aMaxElementSize)
{ {
// Walk the list of children looking for aKidFrame // Walk the list of children looking for aKidFrame
for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) { for (nsIFrame* childFrame = mFrames.FirstChild(); childFrame; childFrame->GetNextSibling(&childFrame)) {
nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(childFrame);
if (!rgFrame) continue; // skip foreign frame types
// If this is a footer row group, remember it // If this is a footer row group, remember it
const nsStyleDisplay *display; const nsStyleDisplay *display;
frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); rgFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
// We only allow a single footer frame, and the footer frame must occur before // We only allow a single footer frame, and the footer frame must occur before
// any body section row groups // any body section row groups
if ((NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == display->mDisplay) && if ((NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == display->mDisplay) &&
!aReflowState.footerFrame && !aReflowState.firstBodySection) { !aReflowState.footerFrame && !aReflowState.firstBodySection) {
aReflowState.footerFrame = frame; aReflowState.footerFrame = childFrame;
} else if ((NS_STYLE_DISPLAY_TABLE_ROW_GROUP == display->mDisplay) && } else if ((NS_STYLE_DISPLAY_TABLE_ROW_GROUP == display->mDisplay) &&
!aReflowState.firstBodySection) { !aReflowState.firstBodySection) {
aReflowState.firstBodySection = frame; aReflowState.firstBodySection = childFrame;
} }
// See if this is the frame we're looking for // See if this is the frame we're looking for
if (frame == aKidFrame) { if (childFrame == aKidFrame) {
// If it's the footer, then keep going because the footer is at the // If it's the footer, then keep going because the footer is at the
// very bottom // very bottom
if (frame != aReflowState.footerFrame) { if (childFrame != aReflowState.footerFrame) {
break; break;
} }
} }
// Get the frame's height // Get the frame's height
nsSize kidSize; nsSize kidSize;
frame->GetSize(kidSize); childFrame->GetSize(kidSize);
// If our height is constrained then update the available height. Do // If our height is constrained then update the available height. Do
// this for all frames including the footer frame // this for all frames including the footer frame
@ -2632,7 +2636,7 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
} }
// Update the running y-offset. Don't do this for the footer frame // Update the running y-offset. Don't do this for the footer frame
if (frame != aReflowState.footerFrame) { if (childFrame != aReflowState.footerFrame) {
aReflowState.y += kidSize.height; aReflowState.y += kidSize.height;
} }
@ -2647,7 +2651,7 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
borderPadding += aReflowState.reflowState.mComputedPadding; borderPadding += aReflowState.reflowState.mComputedPadding;
nscoord cellSpacing = GetCellSpacingX(); nscoord cellSpacing = GetCellSpacingX();
nsSize kidMaxElementSize; nsSize kidMaxElementSize;
((nsTableRowGroupFrame*)frame)->GetMaxElementSize(kidMaxElementSize); rgFrame->GetMaxElementSize(kidMaxElementSize);
nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2; nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2;
aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth); aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth);
aMaxElementSize->height += kidMaxElementSize.height; aMaxElementSize->height += kidMaxElementSize.height;
@ -3264,7 +3268,6 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext,
tableWidth += (leftInset + rightInset); tableWidth += (leftInset + rightInset);
nsRect tableSize = mRect; nsRect tableSize = mRect;
tableSize.width = tableWidth; tableSize.width = tableWidth;
SetRect(aPresContext, tableSize); SetRect(aPresContext, tableSize);
} }

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

@ -1377,6 +1377,9 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
// Move the frames that follow aKidFrame by aDeltaY, and update the running // Move the frames that follow aKidFrame by aDeltaY, and update the running
// y-offset // y-offset
for (aKidFrame->GetNextSibling(&kidFrame); kidFrame; kidFrame->GetNextSibling(&kidFrame)) { for (aKidFrame->GetNextSibling(&kidFrame); kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(kidFrame);
if (!rgFrame) continue; // skip foreign frames
// See if it's the footer we're moving // See if it's the footer we're moving
if (kidFrame == aReflowState.footerFrame) { if (kidFrame == aReflowState.footerFrame) {
movedFooter = PR_TRUE; movedFooter = PR_TRUE;
@ -1390,8 +1393,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
// Update the max element size // Update the max element size
//XXX: this should call into layout strategy to get the width field //XXX: this should call into layout strategy to get the width field
if (aMaxElementSize) if (aMaxElementSize) {
{
const nsStyleSpacing* tableSpacing; const nsStyleSpacing* tableSpacing;
GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)tableSpacing)); GetStyleData(eStyleStruct_Spacing , ((const nsStyleStruct *&)tableSpacing));
nsMargin borderPadding; nsMargin borderPadding;
@ -1399,7 +1401,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext* aPresCon
borderPadding += aReflowState.reflowState.mComputedPadding; borderPadding += aReflowState.reflowState.mComputedPadding;
nscoord cellSpacing = GetCellSpacingX(); nscoord cellSpacing = GetCellSpacingX();
nsSize kidMaxElementSize; nsSize kidMaxElementSize;
((nsTableRowGroupFrame*)kidFrame)->GetMaxElementSize(kidMaxElementSize); rgFrame->GetMaxElementSize(kidMaxElementSize);
nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2; nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2;
aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth); aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth);
aMaxElementSize->height += kidMaxElementSize.height; aMaxElementSize->height += kidMaxElementSize.height;
@ -1926,7 +1928,6 @@ NS_METHOD nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext,
borderPadding += aReflowState.mComputedPadding; borderPadding += aReflowState.mComputedPadding;
InnerTableReflowState state(aPresContext, aReflowState, borderPadding); InnerTableReflowState state(aPresContext, aReflowState, borderPadding);
// now that we've computed the column width information, reflow all children // now that we've computed the column width information, reflow all children
#ifdef NS_DEBUG #ifdef NS_DEBUG
@ -2596,34 +2597,37 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
nsSize* aMaxElementSize) nsSize* aMaxElementSize)
{ {
// Walk the list of children looking for aKidFrame // Walk the list of children looking for aKidFrame
for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) { for (nsIFrame* childFrame = mFrames.FirstChild(); childFrame; childFrame->GetNextSibling(&childFrame)) {
nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(childFrame);
if (!rgFrame) continue; // skip foreign frame types
// If this is a footer row group, remember it // If this is a footer row group, remember it
const nsStyleDisplay *display; const nsStyleDisplay *display;
frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); rgFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
// We only allow a single footer frame, and the footer frame must occur before // We only allow a single footer frame, and the footer frame must occur before
// any body section row groups // any body section row groups
if ((NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == display->mDisplay) && if ((NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == display->mDisplay) &&
!aReflowState.footerFrame && !aReflowState.firstBodySection) { !aReflowState.footerFrame && !aReflowState.firstBodySection) {
aReflowState.footerFrame = frame; aReflowState.footerFrame = childFrame;
} else if ((NS_STYLE_DISPLAY_TABLE_ROW_GROUP == display->mDisplay) && } else if ((NS_STYLE_DISPLAY_TABLE_ROW_GROUP == display->mDisplay) &&
!aReflowState.firstBodySection) { !aReflowState.firstBodySection) {
aReflowState.firstBodySection = frame; aReflowState.firstBodySection = childFrame;
} }
// See if this is the frame we're looking for // See if this is the frame we're looking for
if (frame == aKidFrame) { if (childFrame == aKidFrame) {
// If it's the footer, then keep going because the footer is at the // If it's the footer, then keep going because the footer is at the
// very bottom // very bottom
if (frame != aReflowState.footerFrame) { if (childFrame != aReflowState.footerFrame) {
break; break;
} }
} }
// Get the frame's height // Get the frame's height
nsSize kidSize; nsSize kidSize;
frame->GetSize(kidSize); childFrame->GetSize(kidSize);
// If our height is constrained then update the available height. Do // If our height is constrained then update the available height. Do
// this for all frames including the footer frame // this for all frames including the footer frame
@ -2632,7 +2636,7 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
} }
// Update the running y-offset. Don't do this for the footer frame // Update the running y-offset. Don't do this for the footer frame
if (frame != aReflowState.footerFrame) { if (childFrame != aReflowState.footerFrame) {
aReflowState.y += kidSize.height; aReflowState.y += kidSize.height;
} }
@ -2647,7 +2651,7 @@ nsTableFrame::RecoverState(InnerTableReflowState& aReflowState,
borderPadding += aReflowState.reflowState.mComputedPadding; borderPadding += aReflowState.reflowState.mComputedPadding;
nscoord cellSpacing = GetCellSpacingX(); nscoord cellSpacing = GetCellSpacingX();
nsSize kidMaxElementSize; nsSize kidMaxElementSize;
((nsTableRowGroupFrame*)frame)->GetMaxElementSize(kidMaxElementSize); rgFrame->GetMaxElementSize(kidMaxElementSize);
nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2; nscoord kidWidth = kidMaxElementSize.width + borderPadding.left + borderPadding.right + cellSpacing*2;
aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth); aMaxElementSize->width = PR_MAX(aMaxElementSize->width, kidWidth);
aMaxElementSize->height += kidMaxElementSize.height; aMaxElementSize->height += kidMaxElementSize.height;
@ -3264,7 +3268,6 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext,
tableWidth += (leftInset + rightInset); tableWidth += (leftInset + rightInset);
nsRect tableSize = mRect; nsRect tableSize = mRect;
tableSize.width = tableWidth; tableSize.width = tableWidth;
SetRect(aPresContext, tableSize); SetRect(aPresContext, tableSize);
} }