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

bug 96343 - skip cellspacing logic when child is not a row. sr=attinasi, r=alexsavulov

This commit is contained in:
karnaze%netscape.com 2001-10-22 14:37:03 +00:00
Родитель 55b39581f8
Коммит 4e2a495fca
2 изменённых файлов: 26 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1330,20 +1330,20 @@ nsTableRowGroupFrame::RecoverState(nsRowGroupReflowState& aReflowState,
nsTableFrame::GetTableFrame(this, tableFrame); nsTableFrame::GetTableFrame(this, tableFrame);
nscoord cellSpacingY = tableFrame->GetCellSpacingY(); nscoord cellSpacingY = tableFrame->GetCellSpacingY();
// Walk the list of children looking for aKidFrame // Walk the list of children up to aKidFrame
for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) { for (nsIFrame* frame = mFrames.FirstChild(); frame && (frame != aKidFrame); frame->GetNextSibling(&frame)) {
if (frame == aKidFrame) { nsCOMPtr<nsIAtom> fType;
break; frame->GetFrameType(getter_AddRefs(fType));
} if (fType.get() == nsLayoutAtoms::tableRowFrame) {
// Update the running y-offset
nsSize kidSize;
frame->GetSize(kidSize);
aReflowState.y += kidSize.height + cellSpacingY;
// Update the running y-offset // If our height is constrained then update the available height
nsSize kidSize; if (NS_UNCONSTRAINEDSIZE != aReflowState.availSize.height) {
frame->GetSize(kidSize); aReflowState.availSize.height -= kidSize.height;
aReflowState.y += cellSpacingY + kidSize.height; }
// If our height is constrained then update the available height
if (NS_UNCONSTRAINEDSIZE != aReflowState.availSize.height) {
aReflowState.availSize.height -= kidSize.height;
} }
} }

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

@ -1330,20 +1330,20 @@ nsTableRowGroupFrame::RecoverState(nsRowGroupReflowState& aReflowState,
nsTableFrame::GetTableFrame(this, tableFrame); nsTableFrame::GetTableFrame(this, tableFrame);
nscoord cellSpacingY = tableFrame->GetCellSpacingY(); nscoord cellSpacingY = tableFrame->GetCellSpacingY();
// Walk the list of children looking for aKidFrame // Walk the list of children up to aKidFrame
for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) { for (nsIFrame* frame = mFrames.FirstChild(); frame && (frame != aKidFrame); frame->GetNextSibling(&frame)) {
if (frame == aKidFrame) { nsCOMPtr<nsIAtom> fType;
break; frame->GetFrameType(getter_AddRefs(fType));
} if (fType.get() == nsLayoutAtoms::tableRowFrame) {
// Update the running y-offset
nsSize kidSize;
frame->GetSize(kidSize);
aReflowState.y += kidSize.height + cellSpacingY;
// Update the running y-offset // If our height is constrained then update the available height
nsSize kidSize; if (NS_UNCONSTRAINEDSIZE != aReflowState.availSize.height) {
frame->GetSize(kidSize); aReflowState.availSize.height -= kidSize.height;
aReflowState.y += cellSpacingY + kidSize.height; }
// If our height is constrained then update the available height
if (NS_UNCONSTRAINEDSIZE != aReflowState.availSize.height) {
aReflowState.availSize.height -= kidSize.height;
} }
} }