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

Bug 73235. Don't add scrollbar's width to MES. r=attinasi, sr=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103973 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com 2001-09-27 20:53:21 +00:00
parent b233a6a501
commit 6a8ba73bf2
2 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/generic/nsGfxScrollFrame.cpp
View File

@ -749,34 +749,6 @@ nsGfxScrollFrame::Reflow(nsIPresContext* aPresContext,
size->height = mInner->mMaxElementSize.height;
else
mInner->mMaxElementSize.height = size->height;
// make sure we add in our scrollbar.
nsBoxLayoutState state(aPresContext, aReflowState, aDesiredSize);
const nsStyleDisplay* styleDisplay = nsnull;
nsIFrame* frame = nsnull;
GetFrame(&frame);
frame->GetStyleData(eStyleStruct_Display,
(const nsStyleStruct*&)styleDisplay);
if (mInner->mHasVerticalScrollbar ||
styleDisplay->mOverflow == NS_STYLE_OVERFLOW_SCROLL ||
styleDisplay->mOverflow == NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL) {
nsSize vSize(0,0);
mInner->mVScrollbarBox->GetMinSize(state, vSize);
AddMargin(mInner->mVScrollbarBox, vSize);
size->width += vSize.width;
nsMargin border;
GetBorderAndPadding(border);
nsMargin inset;
GetInset(inset);
border += inset;
size->width += border.left + border.right + inset.left + inset.right;
}
}
return rv;

28
mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
View File

@ -749,34 +749,6 @@ nsGfxScrollFrame::Reflow(nsIPresContext* aPresContext,
size->height = mInner->mMaxElementSize.height;
else
mInner->mMaxElementSize.height = size->height;
// make sure we add in our scrollbar.
nsBoxLayoutState state(aPresContext, aReflowState, aDesiredSize);
const nsStyleDisplay* styleDisplay = nsnull;
nsIFrame* frame = nsnull;
GetFrame(&frame);
frame->GetStyleData(eStyleStruct_Display,
(const nsStyleStruct*&)styleDisplay);
if (mInner->mHasVerticalScrollbar ||
styleDisplay->mOverflow == NS_STYLE_OVERFLOW_SCROLL ||
styleDisplay->mOverflow == NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL) {
nsSize vSize(0,0);
mInner->mVScrollbarBox->GetMinSize(state, vSize);
AddMargin(mInner->mVScrollbarBox, vSize);
size->width += vSize.width;
nsMargin border;
GetBorderAndPadding(border);
nsMargin inset;
GetInset(inset);
border += inset;
size->width += border.left + border.right + inset.left + inset.right;
}
}
return rv;