зеркало из https://github.com/mozilla/pjs.git
Bug 463350. Don't allow fieldsets to break vertically. r+sr=dbaron
--HG-- extra : rebase_source : b40a725617805871f6c463f630099390749ca2a0
This commit is contained in:
Родитель
4962cbd940
Коммит
2c7f8533bf
|
@ -431,7 +431,9 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
|
|||
reflowLegend = mLegendFrame && NS_SUBTREE_DIRTY(mLegendFrame);
|
||||
}
|
||||
|
||||
nsSize availSize(aReflowState.ComputedWidth(), aReflowState.availableHeight);
|
||||
// We don't allow fieldsets to break vertically. If we did, we'd
|
||||
// need logic here to push and pull overflow frames.
|
||||
nsSize availSize(aReflowState.ComputedWidth(), NS_UNCONSTRAINEDSIZE);
|
||||
NS_ASSERTION(!mContentFrame ||
|
||||
nsLayoutUtils::IntrinsicForContainer(aReflowState.rendContext,
|
||||
mContentFrame,
|
||||
|
@ -486,12 +488,6 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
|
|||
reflowContent = PR_TRUE;
|
||||
}
|
||||
|
||||
// if we are contrained then remove the legend from our available height.
|
||||
if (NS_INTRINSICSIZE != availSize.height) {
|
||||
availSize.height -= mLegendSpace;
|
||||
availSize.height = PR_MAX(availSize.height, 0);
|
||||
}
|
||||
|
||||
FinishReflowChild(mLegendFrame, aPresContext, &legendReflowState,
|
||||
legendDesiredSize, 0, 0, NS_FRAME_NO_MOVE_FRAME);
|
||||
} else if (!mLegendFrame) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче