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

Fix for 122369, XBL form selects show scrollbars when their size=the number of options. This fixes that problem. r=bryner, sr=ben, a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116388 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 2002-03-12 10:13:05 +00:00
parent ea10ff831d
commit e47e30f4ce
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
View File

@ -444,6 +444,7 @@ nsOutlinerBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSiz
PRInt32 err;
desiredRows = size.ToInteger(&err);
mHasFixedRowCount = PR_TRUE;
mPageCount = desiredRows;
} else
desiredRows = 1;
} else {
@ -455,12 +456,13 @@ nsOutlinerBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSiz
PRInt32 err;
desiredRows = rows.ToInteger(&err);
mHasFixedRowCount = PR_TRUE;
mPageCount = desiredRows;
} else
desiredRows = 0;
}
aSize.height = GetRowHeight() * desiredRows;
AddBorderAndPadding(aSize);
AddInset(aSize);
nsIBox::AddCSSPrefSize(aBoxLayoutState, this, aSize);
@ -572,7 +574,9 @@ nsOutlinerBodyFrame::SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect&
if (recompute) {
mInnerBox = GetInnerBox();
mPageCount = mRowHeight ? (mInnerBox.height / mRowHeight) : 0;
if (!mHasFixedRowCount)
mPageCount = mRowHeight ? (mInnerBox.height / mRowHeight) : 0;
PRInt32 rowCount;
mView->GetRowCount(&rowCount);
@ -1892,7 +1896,9 @@ NS_IMETHODIMP nsOutlinerBodyFrame::Paint(nsIPresContext* aPresContext,
PRInt32 oldPageCount = mPageCount;
mRowHeight = GetRowHeight();
mInnerBox = GetInnerBox();
mPageCount = mInnerBox.height/mRowHeight;
if (!mHasFixedRowCount)
mPageCount = mInnerBox.height/mRowHeight;
if (mRowHeight != oldRowHeight || oldPageCount != mPageCount) {
// Schedule a ResizeReflow that will update our page count properly.

12
mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
View File

@ -444,6 +444,7 @@ nsOutlinerBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSiz
PRInt32 err;
desiredRows = size.ToInteger(&err);
mHasFixedRowCount = PR_TRUE;
mPageCount = desiredRows;
} else
desiredRows = 1;
} else {
@ -455,12 +456,13 @@ nsOutlinerBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSiz
PRInt32 err;
desiredRows = rows.ToInteger(&err);
mHasFixedRowCount = PR_TRUE;
mPageCount = desiredRows;
} else
desiredRows = 0;
}
aSize.height = GetRowHeight() * desiredRows;
AddBorderAndPadding(aSize);
AddInset(aSize);
nsIBox::AddCSSPrefSize(aBoxLayoutState, this, aSize);
@ -572,7 +574,9 @@ nsOutlinerBodyFrame::SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect&
if (recompute) {
mInnerBox = GetInnerBox();
mPageCount = mRowHeight ? (mInnerBox.height / mRowHeight) : 0;
if (!mHasFixedRowCount)
mPageCount = mRowHeight ? (mInnerBox.height / mRowHeight) : 0;
PRInt32 rowCount;
mView->GetRowCount(&rowCount);
@ -1892,7 +1896,9 @@ NS_IMETHODIMP nsOutlinerBodyFrame::Paint(nsIPresContext* aPresContext,
PRInt32 oldPageCount = mPageCount;
mRowHeight = GetRowHeight();
mInnerBox = GetInnerBox();
mPageCount = mInnerBox.height/mRowHeight;
if (!mHasFixedRowCount)
mPageCount = mInnerBox.height/mRowHeight;
if (mRowHeight != oldRowHeight || oldPageCount != mPageCount) {
// Schedule a ResizeReflow that will update our page count properly.