Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Grid fixes. NOT IN BUILD

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@105432 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
evaughan%netscape.com 2001-10-15 22:37:25 +00:00
parent b37c8a9a3f
commit 49b5b14759
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/layout/xul/base/src/grid/nsGrid.cpp
View File

@ -604,6 +604,24 @@ nsGrid::GetPrefRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, nscoord& aSiz
}
}
// is the row bogus? If so then just ask it for its size
// it should not be affected by cells in the grid.
if (row->mIsBogus)
{
nsSize size(0,0);
nsIBox* box = row->GetBox();
if (box) {
box->GetPrefSize(aState, size);
nsBox::AddMargin(box, size);
nsStackLayout::AddOffset(aState, box, size);
}
row->mPref = GET_HEIGHT(size, aIsRow);
aSize = row->mPref;
return NS_OK;
}
nsSize size(0,0);
nsGridCell* child;
@ -673,6 +691,24 @@ nsGrid::GetMinRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, nscoord& aSize
}
}
// is the row bogus? If so then just ask it for its size
// it should not be affected by cells in the grid.
if (row->mIsBogus)
{
nsSize size(0,0);
nsIBox* box = row->GetBox();
if (box) {
box->GetPrefSize(aState, size);
nsBox::AddMargin(box, size);
nsStackLayout::AddOffset(aState, box, size);
}
row->mMin = GET_HEIGHT(size, aIsRow);
aSize = row->mMin;
return NS_OK;
}
nsSize size(0,0);
nsGridCell* child;
@ -742,6 +778,24 @@ nsGrid::GetMaxRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, nscoord& aSize
}
}
// is the row bogus? If so then just ask it for its size
// it should not be affected by cells in the grid.
if (row->mIsBogus)
{
nsSize size(NS_INTRINSICSIZE,NS_INTRINSICSIZE);
nsIBox* box = row->GetBox();
if (box) {
box->GetPrefSize(aState, size);
nsBox::AddMargin(box, size);
nsStackLayout::AddOffset(aState, box, size);
}
row->mMax = GET_HEIGHT(size, aIsRow);
aSize = row->mMax;
return NS_OK;
}
nsSize size(NS_INTRINSICSIZE,NS_INTRINSICSIZE);
nsGridCell* child;