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

1) Fixed collapsing code. So sidebar does not assert when brought up closed.

Browse Source 
2) fixed menu dismissing bug.


git-svn-id: svn://10.0.0.236/trunk@70083 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
evaughan%netscape.com
2000-05-16 20:46:08 +00:00
parent 28e215d8dc
commit 9b4df52e9b
8 changed files with 209 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/layout/xul/base/src/nsStackLayout.cpp
View File

@@ -76,16 +76,16 @@ nsStackLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsSi
while (child)
{
// ignore collapsed children
PRBool isCollapsed = PR_FALSE;
child->IsCollapsed(aBoxLayoutState, isCollapsed);
// PRBool isCollapsed = PR_FALSE;
// child->IsCollapsed(aBoxLayoutState, isCollapsed);
if (!isCollapsed)
{
// if (!isCollapsed)
// {
nsSize pref(0,0);
child->GetPrefSize(aBoxLayoutState, pref);
AddMargin(child, pref);
AddLargestSize(aSize, pref);
}
// }
child->GetNextBox(&child);
}
@@ -112,16 +112,16 @@ nsStackLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsSiz
while (child)
{
// ignore collapsed children
PRBool isCollapsed = PR_FALSE;
aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
//PRBool isCollapsed = PR_FALSE;
//aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
if (!isCollapsed)
{
//if (!isCollapsed)
//{
nsSize min(0,0);
child->GetMinSize(aBoxLayoutState, min);
AddMargin(child, min);
AddLargestSize(aSize, min);
}
//}
child->GetNextBox(&child);
}
@@ -150,18 +150,18 @@ nsStackLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsSiz
while (child)
{
// ignore collapsed children
PRBool isCollapsed = PR_FALSE;
aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
//PRBool isCollapsed = PR_FALSE;
//aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
if (!isCollapsed)
{
//if (!isCollapsed)
//{
// if completely redefined don't even ask our child for its size.
nsSize max(NS_INTRINSICSIZE, NS_INTRINSICSIZE);
child->GetMaxSize(aBoxLayoutState, max);
AddMargin(child, max);
AddSmallestSize(aSize, max);
}
//}
child->GetNextBox(&child);
@@ -189,11 +189,11 @@ nsStackLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nscoor
while (child)
{
// ignore collapsed children
PRBool isCollapsed = PR_FALSE;
aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
//PRBool isCollapsed = PR_FALSE;
//aBox->IsCollapsed(aBoxLayoutState, isCollapsed);
if (!isCollapsed)
{
//if (!isCollapsed)
//{
// if completely redefined don't even ask our child for its size.
nscoord ascent = 0;
child->GetAscent(aBoxLayoutState, ascent);
@@ -203,7 +203,7 @@ nsStackLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nscoor
if (ascent > aAscent)
aAscent = ascent;
}
//}
child->GetNextBox(&child);