From 9864dac91dd45b52010cbe8f4bc7f79a4e021240 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 21 Oct 2003 16:27:48 +0000 Subject: [PATCH] Make sure to include the border and padding in the frame size even in the "0 width" case. Bug 222990, r+sr=roc git-svn-id: svn://10.0.0.236/trunk@148208 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsComboboxControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 1b660e2d9e7..ae574f17a82 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -946,7 +946,7 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext * aPresContext, aDropDownBtn->SetRect(buttonRect); SetChildFrameSize(aDropDownBtn, aBtnWidth, aDesiredSize.height); aDesiredSize.width = 0; - aDesiredSize.height = dispHeight; + aDesiredSize.height = dispHeight + aBorderPadding.top + aBorderPadding.bottom;; // XXX What about ascent and descent? return; } diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 1b660e2d9e7..ae574f17a82 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -946,7 +946,7 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext * aPresContext, aDropDownBtn->SetRect(buttonRect); SetChildFrameSize(aDropDownBtn, aBtnWidth, aDesiredSize.height); aDesiredSize.width = 0; - aDesiredSize.height = dispHeight; + aDesiredSize.height = dispHeight + aBorderPadding.top + aBorderPadding.bottom;; // XXX What about ascent and descent? return; }