Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 19:33:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hyatt%netscape.com 2002-01-07 20:02:19 +00:00
parent 17e7536dd9
commit 40b05ee2d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/xul/base/src/nsBox.cpp
View File

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