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

removed the incremental reflow targeted at the display text

Browse Source 
instead we just reflow the text and the button each time.
b=40644 r=kmcclusk


git-svn-id: svn://10.0.0.236/trunk@72307 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
2000-06-15 13:02:10 +00:00
parent 1a499e2d1a
commit f58dc37a07
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1303,22 +1303,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
//mListControlFrame->SetOverrideReflowOptimization(PR_TRUE);
} else if (targetFrame == mDisplayFrame || targetFrame == buttonFrame) {
if (targetFrame == mDisplayFrame) {
nsresult rv = ReflowComboChildFrame(mDisplayFrame, aPresContext, aDesiredSize,
aReflowState, aStatus,
mCacheSize.width,
aReflowState.availableHeight);
NS_ASSERTION(aDesiredSize.width != kSizeNotSet, "aDesiredSize.width != kSizeNotSet");
NS_ASSERTION(aDesiredSize.height != kSizeNotSet, "aDesiredSize.height != kSizeNotSet");
aDesiredSize.mOverflowArea.x = 0;
aDesiredSize.mOverflowArea.y = 0;
aDesiredSize.mOverflowArea.width = aDesiredSize.width;
aDesiredSize.mOverflowArea.height = aDesiredSize.height;
return rv;
}
// The incremental reflow is targeted at either the block or the button
REFLOW_DEBUG_MSG2("-----------------Target is %s------------\n", (targetFrame == mDisplayFrame?"DisplayItem Frame":"DropDown Btn Frame"));
// The incremental reflow is targeted at either the block or the button
REFLOW_DEBUG_MSG("---- Doing AreaFrame Reflow and then bailing out\n");
// Do simple reflow and bail out
ReflowCombobox(aPresContext, firstPassState, aDesiredSize, aStatus,

16
mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
View File

@@ -1303,22 +1303,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext,
//mListControlFrame->SetOverrideReflowOptimization(PR_TRUE);
} else if (targetFrame == mDisplayFrame || targetFrame == buttonFrame) {
if (targetFrame == mDisplayFrame) {
nsresult rv = ReflowComboChildFrame(mDisplayFrame, aPresContext, aDesiredSize,
aReflowState, aStatus,
mCacheSize.width,
aReflowState.availableHeight);
NS_ASSERTION(aDesiredSize.width != kSizeNotSet, "aDesiredSize.width != kSizeNotSet");
NS_ASSERTION(aDesiredSize.height != kSizeNotSet, "aDesiredSize.height != kSizeNotSet");
aDesiredSize.mOverflowArea.x = 0;
aDesiredSize.mOverflowArea.y = 0;
aDesiredSize.mOverflowArea.width = aDesiredSize.width;
aDesiredSize.mOverflowArea.height = aDesiredSize.height;
return rv;
}
// The incremental reflow is targeted at either the block or the button
REFLOW_DEBUG_MSG2("-----------------Target is %s------------\n", (targetFrame == mDisplayFrame?"DisplayItem Frame":"DropDown Btn Frame"));
// The incremental reflow is targeted at either the block or the button
REFLOW_DEBUG_MSG("---- Doing AreaFrame Reflow and then bailing out\n");
// Do simple reflow and bail out
ReflowCombobox(aPresContext, firstPassState, aDesiredSize, aStatus,