Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 603141 (2/2) - <select multiple> should show 4 rows by default. r=bz a=blocking-b8

Browse Source
This commit is contained in:
Mounir Lamouri 2010-11-09 15:24:01 +01:00
parent ffd3fed7eb
commit 5dc8d4f542
1 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
layout/forms/nsListControlFrame.cpp
View File

@ -469,25 +469,6 @@ GetNumberOfOptionsRecursive(nsIContent* aContent)
return optionCount;
}
static nscoord
GetOptGroupLabelsHeight(nsIContent* aContent,
nscoord aRowHeight)
{
nscoord height = 0;
const PRUint32 childCount = aContent ? aContent->GetChildCount() : 0;
for (PRUint32 index = 0; index < childCount; ++index) {
nsIContent* child = aContent->GetChildAt(index);
if (::IsOptGroup(child)) {
PRUint32 numOptions = ::GetNumberOfOptionsRecursive(child);
nscoord optionsHeight = aRowHeight * numOptions;
nsIFrame* frame = child->GetPrimaryFrame();
nscoord totalHeight = frame ? frame->GetSize().height : 0;
height += NS_MAX(0, totalHeight - optionsHeight);
}
}
return height;
}
//-----------------------------------------------------------------
// Main Reflow for ListBox/Dropdown
//-----------------------------------------------------------------
@ -1914,40 +1895,15 @@ nsListControlFrame::CalcIntrinsicHeight(nscoord aHeightOfARow,
{
NS_PRECONDITION(!IsInDropDownMode(),
"Shouldn't be in dropdown mode when we call this");
mNumDisplayRows = 1;
GetSizeAttribute(&mNumDisplayRows);
// Extra height to tack on to aHeightOfARow * mNumDisplayRows
nscoord extraHeight = 0;
if (mNumDisplayRows < 1) {
// When SIZE=0 or unspecified we constrain the height to
// [2..kMaxDropDownRows] rows. We add in the height of optgroup labels
// (within the constraint above), bug 300474.
nscoord labelHeight = ::GetOptGroupLabelsHeight(mContent, aHeightOfARow);
if (GetMultiple()) {
if (aNumberOfOptions < 2) {
// Add in 1 aHeightOfARow also when aNumberOfOptions == 0
mNumDisplayRows = 1;
extraHeight = NS_MAX(aHeightOfARow, labelHeight);
}
else if (aNumberOfOptions * aHeightOfARow + labelHeight >
kMaxDropDownRows * aHeightOfARow) {
mNumDisplayRows = kMaxDropDownRows;
} else {
mNumDisplayRows = aNumberOfOptions;
extraHeight = labelHeight;
}
}
else {
NS_NOTREACHED("Shouldn't hit this case -- we should a be a combobox if "
"we have no size set and no multiple set!");
}
mNumDisplayRows = 4;
}
return mNumDisplayRows * aHeightOfARow + extraHeight;
return mNumDisplayRows * aHeightOfARow;
}
//----------------------------------------------------------------------