Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 04:05:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for dogfood bug 41027 -r hyatt

Browse Source
This commit is contained in:
evaughan%netscape.com 2000-05-31 20:14:28 +00:00
parent 6c56f39224
commit 4401bea579
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/xul/base/src/nsSprocketLayout.cpp
View File

@ -326,8 +326,13 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
PRBool layout = PR_TRUE;
child->GetMargin(margin);
if (childRect.width >= margin.left + margin.right && childRect.height >= margin.top + margin.bottom)
childRect.Deflate(margin);
//if (childRect.width >= margin.left + margin.right && childRect.height >= margin.top + margin.bottom)
childRect.Deflate(margin);
if (childRect.width < 0)
childRect.width = 0;
if (childRect.height < 0)
childRect.height = 0;
if (passes > 0) {
layout = PR_FALSE;

6
layout/xul/base/src/nsStackLayout.cpp
View File

@ -232,6 +232,12 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
child->GetMargin(margin);
nsRect childRect(clientRect);
childRect.Deflate(margin);
if (childRect.width < 0)
childRect.width = 0;
if (childRect.height < 0)
childRect.height = 0;
child->SetBounds(aState, childRect);
child->Layout(aState);
child->GetBounds(childRect);