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

Replace computation of max-element-size (height and width) with max-element-width alone, since the max-element-height is practically unused and not meaningful for layout. b=186953 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@136064 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-01-09 14:26:32 +00:00
parent 1c7f8e98ea
commit a569c670f5
115 changed files with 1120 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/layout/forms/nsComboboxControlFrame.cpp
View File

@@ -292,8 +292,7 @@ nsComboboxControlFrame::nsComboboxControlFrame()
mCacheSize.width = kSizeNotSet;
mCacheSize.height = kSizeNotSet;
mCachedAscent = kSizeNotSet;
mCachedMaxElementSize.width = kSizeNotSet;
mCachedMaxElementSize.height = kSizeNotSet;
mCachedMaxElementWidth = kSizeNotSet;
mCachedAvailableSize.width = kSizeNotSet;
mCachedAvailableSize.height = kSizeNotSet;
mCachedUncDropdownSize.width = kSizeNotSet;
@@ -1042,8 +1041,8 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext * aPresContext,
/////////////////////////////////////////////////////////
// The DisplayFrame is a Block frame containing a TextFrame
// and it is completely anonymous, so we must manually reflow it
nsHTMLReflowMetrics txtKidSize(PR_TRUE);
nsSize txtAvailSize(dispWidth - aBtnWidth, dispHeight);
nsHTMLReflowMetrics txtKidSize(&txtAvailSize);
nsHTMLReflowState txtKidReflowState(aPresContext, aReflowState, aDisplayFrame, txtAvailSize, reason);
aDisplayFrame->WillReflow(aPresContext);
@@ -1126,9 +1125,8 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext * aPresContext,
REFLOW_NOISY_MSG3("**AdjustCombobox - Reflow: WW: %d HH: %d\n", aDesiredSize.width, aDesiredSize.height);
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
aDesiredSize.maxElementSize->height = aDesiredSize.height;
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = aDesiredSize.width;
}
aDesiredSize.ascent =
@@ -1146,7 +1144,7 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext * aPresContext,
mCachedAvailableSize.height = aDesiredSize.height - (aBorderPadding.top + aBorderPadding.bottom);
}
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedAscent,
mCachedMaxElementSize, aDesiredSize);
mCachedMaxElementWidth, aDesiredSize);
}
///////////////////////////////////////////////////////////////////
@@ -1248,7 +1246,7 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
// NOTE: this returns whether we are doing an Incremental reflow
nsFormControlFrame::SkipResizeReflow(mCacheSize,
mCachedAscent,
mCachedMaxElementSize,
mCachedMaxElementWidth,
mCachedAvailableSize,
aDesiredSize, aReflowState,
aStatus,
@@ -1429,9 +1427,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
aDesiredSize.ascent = mCachedAscent;
aDesiredSize.descent = aDesiredSize.height - aDesiredSize.ascent;
if (aDesiredSize.maxElementSize != nsnull) {
aDesiredSize.maxElementSize->width = mCachedMaxElementSize.width;
aDesiredSize.maxElementSize->height = mCachedMaxElementSize.height;
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = mCachedMaxElementWidth;
}
NS_ASSERTION(aDesiredSize.width != kSizeNotSet, "aDesiredSize.width != kSizeNotSet");
NS_ASSERTION(aDesiredSize.height != kSizeNotSet, "aDesiredSize.height != kSizeNotSet");
@@ -1527,9 +1524,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
aDesiredSize.ascent = mCachedAscent;
aDesiredSize.descent = aDesiredSize.height - aDesiredSize.ascent;
if (aDesiredSize.maxElementSize != nsnull) {
aDesiredSize.maxElementSize->width = mCachedMaxElementSize.width;
aDesiredSize.maxElementSize->height = mCachedMaxElementSize.height;
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = mCachedMaxElementWidth;
}
UNCONSTRAINED_CHECK();
REFLOW_DEBUG_MSG3("#** Done nsCCF DW: %d DH: %d\n\n", PX(aDesiredSize.width), PX(aDesiredSize.height));
@@ -1696,9 +1692,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
#endif // DO_NEW_REFLOW
// Set the max element size to be the same as the desired element size.
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
aDesiredSize.maxElementSize->height = aDesiredSize.height;
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = aDesiredSize.width;
}
#if 0
@@ -1719,7 +1714,7 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
aReflowState.mComputedBorderPadding.bottom);
}
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedAscent, mCachedMaxElementSize, aDesiredSize);
nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedAscent, mCachedMaxElementWidth, aDesiredSize);
REFLOW_DEBUG_MSG3("** Done nsCCF DW: %d DH: %d\n\n", PX(aDesiredSize.width), PX(aDesiredSize.height));
REFLOW_COUNTER();