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

Swap the order between the legend and area frames in a fieldset to fix selection and tabbing problems. b=236071 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@167179 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2005-01-02 14:30:24 +00:00
parent 77f2787430
commit bb956e086b
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/layout/forms/nsFieldSetFrame.cpp
View File

@@ -166,10 +166,14 @@ nsFieldSetFrame::SetInitialChildList(nsPresContext* aPresContext,
nsIAtom* aListName,
nsIFrame* aChildList)
{
// get the content and legend frames.
mContentFrame = aChildList;
mLegendFrame = mContentFrame->GetNextSibling();
// Get the content and legend frames.
if (aChildList->GetNextSibling()) {
mContentFrame = aChildList->GetNextSibling();
mLegendFrame = aChildList;
} else {
mContentFrame = aChildList;
mLegendFrame = nsnull;
}
// Queue up the frames for the content frame
return nsHTMLContainerFrame::SetInitialChildList(aPresContext, nsnull, aChildList);
@@ -627,14 +631,9 @@ nsFieldSetFrame::RemoveFrame(nsPresContext* aPresContext,
// XXX XXX
// XXX temporary fix for bug 70648
if (aOldFrame == mLegendFrame) {
nsIFrame* sibling = mContentFrame->GetNextSibling();
NS_ASSERTION(sibling == mLegendFrame, "legendFrame is not next sibling");
NS_ASSERTION(mLegendFrame->GetParent() == this, "Legend Parent has wrong parent");
nsIFrame* legendSibling = sibling->GetNextSibling();
// replace the legend, which is the next sibling, with any siblings of the legend (XXX always null?)
mContentFrame->SetNextSibling(legendSibling);
// OK, the legend is now removed from the sibling list, but who has ownership of it?
mLegendFrame->Destroy(aPresContext);
NS_ASSERTION(mLegendFrame->GetNextSibling() == mContentFrame, "mContentFrame is not next sibling");
mFrames.DestroyFrame(aPresContext, mLegendFrame);
mLegendFrame = nsnull;
return NS_OK;
} else {