corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
troy@netscape.com
1999-08-21 21:24:42 +00:00
parent 4a6cb485e3
commit d1c39e45d2
2 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
layout/html/table/src/nsTableRowFrame.cpp
View File

@@ -1102,26 +1102,28 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
nscoord& aMaxCellTopMargin, nscoord& aMaxCellTopMargin,
nscoord& aMaxCellBottomMargin) nscoord& aMaxCellBottomMargin)
{ {
// Initialize OUT parameters
aMaxCellTopMargin = aMaxCellBottomMargin = 0; aMaxCellTopMargin = aMaxCellBottomMargin = 0;
// Walk the list of children looking for aKidFrame. While we're at // Walk the child frames (except aKidFrame) and find the table cell frames
// it get the maxCellHeight and maxVertCellSpace for all the for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) {
// frames except aKidFrame if (frame != aKidFrame) {
for (nsIFrame* frame = mFrames.FirstChild(); nsnull != frame;) // See if the frame is a table cell frame
{
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
if (NS_STYLE_DISPLAY_TABLE_CELL == kidDisplay->mDisplay)
{ if (NS_STYLE_DISPLAY_TABLE_CELL == kidDisplay->mDisplay) {
if (frame != aKidFrame) {
// Update the max top and bottom margins
nsMargin kidMargin; nsMargin kidMargin;
// Update the max top and bottom margins
aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, kidMargin); aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, kidMargin);
if (kidMargin.top > aMaxCellTopMargin) if (kidMargin.top > aMaxCellTopMargin)
aMaxCellTopMargin = kidMargin.top; aMaxCellTopMargin = kidMargin.top;
if (kidMargin.bottom > aMaxCellBottomMargin) if (kidMargin.bottom > aMaxCellBottomMargin)
aMaxCellBottomMargin = kidMargin.bottom; aMaxCellBottomMargin = kidMargin.bottom;
// Update maxCellHeight and maxVertCellSpace. When determining this we
// don't include cells that span rows
PRInt32 rowSpan = aReflowState.tableFrame->GetEffectiveRowSpan(mRowIndex, ((nsTableCellFrame *)frame)); PRInt32 rowSpan = aReflowState.tableFrame->GetEffectiveRowSpan(mRowIndex, ((nsTableCellFrame *)frame));
if (mMinRowSpan == rowSpan) { if (mMinRowSpan == rowSpan) {
// Get the cell's desired height the last time it was reflowed // Get the cell's desired height the last time it was reflowed
@@ -1139,14 +1141,9 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
} }
// Update maxCellVertHeight // Update maxCellVertHeight
nsMargin margin; nscoord vertHeight = desiredSize.height + kidMargin.top + kidMargin.bottom;
if (vertHeight > aReflowState.maxCellVertSpace) {
if (aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, margin) == NS_OK) aReflowState.maxCellVertSpace = vertHeight;
{
nscoord height = desiredSize.height + margin.top + margin.bottom;
if (height > aReflowState.maxCellVertSpace) {
aReflowState.maxCellVertSpace = height;
}
} }
} }
@@ -1157,8 +1154,6 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
// table cell, and that will include the max element size... // table cell, and that will include the max element size...
} }
} }
frame->GetNextSibling(&frame);
} }
// Update the running x-offset based on the frame's current x-origin // Update the running x-offset based on the frame's current x-origin
@@ -1282,8 +1277,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext& aPresContext,
if (kidMargin.bottom > maxCellBottomMargin) if (kidMargin.bottom > maxCellBottomMargin)
maxCellBottomMargin = kidMargin.bottom; maxCellBottomMargin = kidMargin.bottom;
// At this point, we know the column widths. Get the available width // At this point, we know the column widths. Compute the cell available width
// from the known column widths
PRInt32 cellColIndex; PRInt32 cellColIndex;
((nsTableCellFrame *)aNextFrame)->GetColIndex(cellColIndex); ((nsTableCellFrame *)aNextFrame)->GetColIndex(cellColIndex);
PRInt32 cellColSpan = aReflowState.tableFrame->GetEffectiveColSpan(cellColIndex, PRInt32 cellColSpan = aReflowState.tableFrame->GetEffectiveColSpan(cellColIndex,
@@ -1360,9 +1354,6 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext& aPresContext,
// Calculate the cell's actual size given its pass2 size. This function // Calculate the cell's actual size given its pass2 size. This function
// takes into account the specified height (in the style), and any special // takes into account the specified height (in the style), and any special
// logic needed for backwards compatibility // logic needed for backwards compatibility
// XXX We need to ask the table (or the table layout strategy) if the column
// widths have changed. If so, we just bail and return a status indicating
// what happened and let the table reflow all the table cells...
CalculateCellActualSize(aNextFrame, desiredSize.width, desiredSize.height, CalculateCellActualSize(aNextFrame, desiredSize.width, desiredSize.height,
cellAvailWidth); cellAvailWidth);

39
layout/tables/nsTableRowFrame.cpp
View File

@@ -1102,26 +1102,28 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
nscoord& aMaxCellTopMargin, nscoord& aMaxCellTopMargin,
nscoord& aMaxCellBottomMargin) nscoord& aMaxCellBottomMargin)
{ {
// Initialize OUT parameters
aMaxCellTopMargin = aMaxCellBottomMargin = 0; aMaxCellTopMargin = aMaxCellBottomMargin = 0;
// Walk the list of children looking for aKidFrame. While we're at // Walk the child frames (except aKidFrame) and find the table cell frames
// it get the maxCellHeight and maxVertCellSpace for all the for (nsIFrame* frame = mFrames.FirstChild(); frame; frame->GetNextSibling(&frame)) {
// frames except aKidFrame if (frame != aKidFrame) {
for (nsIFrame* frame = mFrames.FirstChild(); nsnull != frame;) // See if the frame is a table cell frame
{
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); frame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
if (NS_STYLE_DISPLAY_TABLE_CELL == kidDisplay->mDisplay)
{ if (NS_STYLE_DISPLAY_TABLE_CELL == kidDisplay->mDisplay) {
if (frame != aKidFrame) {
// Update the max top and bottom margins
nsMargin kidMargin; nsMargin kidMargin;
// Update the max top and bottom margins
aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, kidMargin); aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, kidMargin);
if (kidMargin.top > aMaxCellTopMargin) if (kidMargin.top > aMaxCellTopMargin)
aMaxCellTopMargin = kidMargin.top; aMaxCellTopMargin = kidMargin.top;
if (kidMargin.bottom > aMaxCellBottomMargin) if (kidMargin.bottom > aMaxCellBottomMargin)
aMaxCellBottomMargin = kidMargin.bottom; aMaxCellBottomMargin = kidMargin.bottom;
// Update maxCellHeight and maxVertCellSpace. When determining this we
// don't include cells that span rows
PRInt32 rowSpan = aReflowState.tableFrame->GetEffectiveRowSpan(mRowIndex, ((nsTableCellFrame *)frame)); PRInt32 rowSpan = aReflowState.tableFrame->GetEffectiveRowSpan(mRowIndex, ((nsTableCellFrame *)frame));
if (mMinRowSpan == rowSpan) { if (mMinRowSpan == rowSpan) {
// Get the cell's desired height the last time it was reflowed // Get the cell's desired height the last time it was reflowed
@@ -1139,14 +1141,9 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
} }
// Update maxCellVertHeight // Update maxCellVertHeight
nsMargin margin; nscoord vertHeight = desiredSize.height + kidMargin.top + kidMargin.bottom;
if (vertHeight > aReflowState.maxCellVertSpace) {
if (aReflowState.tableFrame->GetCellMarginData((nsTableCellFrame *)frame, margin) == NS_OK) aReflowState.maxCellVertSpace = vertHeight;
{
nscoord height = desiredSize.height + margin.top + margin.bottom;
if (height > aReflowState.maxCellVertSpace) {
aReflowState.maxCellVertSpace = height;
}
} }
} }
@@ -1157,8 +1154,6 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
// table cell, and that will include the max element size... // table cell, and that will include the max element size...
} }
} }
frame->GetNextSibling(&frame);
} }
// Update the running x-offset based on the frame's current x-origin // Update the running x-offset based on the frame's current x-origin
@@ -1282,8 +1277,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext& aPresContext,
if (kidMargin.bottom > maxCellBottomMargin) if (kidMargin.bottom > maxCellBottomMargin)
maxCellBottomMargin = kidMargin.bottom; maxCellBottomMargin = kidMargin.bottom;
// At this point, we know the column widths. Get the available width // At this point, we know the column widths. Compute the cell available width
// from the known column widths
PRInt32 cellColIndex; PRInt32 cellColIndex;
((nsTableCellFrame *)aNextFrame)->GetColIndex(cellColIndex); ((nsTableCellFrame *)aNextFrame)->GetColIndex(cellColIndex);
PRInt32 cellColSpan = aReflowState.tableFrame->GetEffectiveColSpan(cellColIndex, PRInt32 cellColSpan = aReflowState.tableFrame->GetEffectiveColSpan(cellColIndex,
@@ -1360,9 +1354,6 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext& aPresContext,
// Calculate the cell's actual size given its pass2 size. This function // Calculate the cell's actual size given its pass2 size. This function
// takes into account the specified height (in the style), and any special // takes into account the specified height (in the style), and any special
// logic needed for backwards compatibility // logic needed for backwards compatibility
// XXX We need to ask the table (or the table layout strategy) if the column
// widths have changed. If so, we just bail and return a status indicating
// what happened and let the table reflow all the table cells...
CalculateCellActualSize(aNextFrame, desiredSize.width, desiredSize.height, CalculateCellActualSize(aNextFrame, desiredSize.width, desiredSize.height,
cellAvailWidth); cellAvailWidth);