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

work in progress for table visibility=collapse

Browse Source
This commit is contained in:
karnaze@netscape.com
1999-02-03 23:54:32 +00:00
parent 16f20e191e
commit 43ae593e7c
8 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/html/table/src/nsTableFrame.cpp
View File

@@ -4949,3 +4949,9 @@ nsTableFrame::GetRowGroupFrameFor(nsIFrame* aFrame, const nsStyleDisplay* aDispl
return (nsTableRowGroupFrame*)result;
}
PRBool
nsTableFrame::IsFinalPass(const nsReflowState& aState)
{
return (NS_UNCONSTRAINEDSIZE != aState.availableWidth) ||
(NS_UNCONSTRAINEDSIZE != aState.availableHeight);
}

2
layout/html/table/src/nsTableFrame.h
View File

@@ -402,6 +402,8 @@ public:
virtual void AddColumnFrame (nsTableColFrame *aColFrame);
static PRBool IsFinalPass(const nsReflowState& aReflowState);
protected:
/** protected constructor.

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

@@ -63,7 +63,6 @@ struct RowReflowState {
nsTableFrame *tableFrame;
RowReflowState(const nsHTMLReflowState& aReflowState,
nsTableFrame* aTableFrame)
: reflowState(aReflowState)
@@ -1417,6 +1416,17 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
break;
}
// check the visibility in the final pass. If it is collapse, set our desired size to 0
if (nsTableFrame::IsFinalPass(aReflowState)) {
const nsStyleDisplay *display;
GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if (NS_STYLE_VISIBILITY_COLLAPSE == display->mVisible) {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
}
// XXX TROY
#if 0
aStatus = NS_FRAME_COMPLETE; // we're never continued

13
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@@ -643,7 +643,8 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
{
const nsStyleDisplay *childDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
if ((NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay) &&
(NS_STYLE_VISIBILITY_COLLAPSE != childDisplay->mVisible))
{
// get the height of the tallest cell in the row (excluding cells that span rows)
nscoord maxCellHeight = ((nsTableRowFrame*)rowFrame)->GetTallestChild();
@@ -1030,6 +1031,16 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
}
}
// check the visibility in the final pass. If it is collapse, set our desired size to 0
if (nsTableFrame::IsFinalPass(aReflowState)) {
const nsStyleDisplay *display;
GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if (NS_STYLE_VISIBILITY_COLLAPSE == display->mVisible) {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
}
if (gsDebug==PR_TRUE)
{
if (nsnull!=aDesiredSize.maxElementSize)

6
layout/tables/nsTableFrame.cpp
View File

@@ -4949,3 +4949,9 @@ nsTableFrame::GetRowGroupFrameFor(nsIFrame* aFrame, const nsStyleDisplay* aDispl
return (nsTableRowGroupFrame*)result;
}
PRBool
nsTableFrame::IsFinalPass(const nsReflowState& aState)
{
return (NS_UNCONSTRAINEDSIZE != aState.availableWidth) ||
(NS_UNCONSTRAINEDSIZE != aState.availableHeight);
}

2
layout/tables/nsTableFrame.h
View File

@@ -402,6 +402,8 @@ public:
virtual void AddColumnFrame (nsTableColFrame *aColFrame);
static PRBool IsFinalPass(const nsReflowState& aReflowState);
protected:
/** protected constructor.

12
layout/tables/nsTableRowFrame.cpp
View File

@@ -63,7 +63,6 @@ struct RowReflowState {
nsTableFrame *tableFrame;
RowReflowState(const nsHTMLReflowState& aReflowState,
nsTableFrame* aTableFrame)
: reflowState(aReflowState)
@@ -1417,6 +1416,17 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
break;
}
// check the visibility in the final pass. If it is collapse, set our desired size to 0
if (nsTableFrame::IsFinalPass(aReflowState)) {
const nsStyleDisplay *display;
GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if (NS_STYLE_VISIBILITY_COLLAPSE == display->mVisible) {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
}
// XXX TROY
#if 0
aStatus = NS_FRAME_COMPLETE; // we're never continued

13
layout/tables/nsTableRowGroupFrame.cpp
View File

@@ -643,7 +643,8 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
{
const nsStyleDisplay *childDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
if ((NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay) &&
(NS_STYLE_VISIBILITY_COLLAPSE != childDisplay->mVisible))
{
// get the height of the tallest cell in the row (excluding cells that span rows)
nscoord maxCellHeight = ((nsTableRowFrame*)rowFrame)->GetTallestChild();
@@ -1030,6 +1031,16 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
}
}
// check the visibility in the final pass. If it is collapse, set our desired size to 0
if (nsTableFrame::IsFinalPass(aReflowState)) {
const nsStyleDisplay *display;
GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if (NS_STYLE_VISIBILITY_COLLAPSE == display->mVisible) {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
}
if (gsDebug==PR_TRUE)
{
if (nsnull!=aDesiredSize.maxElementSize)