Fix for 118550, I screwed up minwidth and minheight on boxes. Somewhere evaughan is rolling over in his grave. r=jag, sr=ben

git-svn-id: svn://10.0.0.236/trunk@111501 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com
2002-01-07 20:02:19 +00:00
parent 779d00d083
commit 5d02ce1715

View File

@@ -1312,7 +1312,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
// we will assume 0 means not set.
if (position->mMinWidth.GetUnit() == eStyleUnit_Coord) {
nscoord min = position->mMinWidth.GetCoordValue();
if (min && min > aSize.width) {
if (min && (!widthSet || min > aSize.width)) {
aSize.width = min;
widthSet = PR_TRUE;
}
@@ -1320,7 +1320,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
if (position->mMinHeight.GetUnit() == eStyleUnit_Coord) {
nscoord min = position->mMinHeight.GetCoordValue();
if (min && min > aSize.height) {
if (min && (!heightSet || min > aSize.height)) {
aSize.height = min;
heightSet = PR_TRUE;
}