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

Remove the consumers of GetScrollBarDimensions so that we can work on removing

Browse Source 
the API too.  Bug 364301, r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@217200 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-12-19 15:08:34 +00:00
parent 6e9115cd9c
commit 78cfdd7ca8
3 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/layout/forms/nsTextControlFrame.cpp
View File

@@ -1360,24 +1360,18 @@ nsTextControlFrame::CalcIntrinsicSize(nsIRenderingContext* aRenderingContext,
// Add in the size of the scrollbars for textarea
if (IsTextArea()) {
float p2t;
p2t = presContext->PixelsToTwips();
nsIFrame* first = GetFirstChild(nsnull);
nsIDeviceContext *dx = presContext->DeviceContext();
nsIScrollableFrame *scrollableFrame;
CallQueryInterface(first, &scrollableFrame);
NS_ASSERTION(scrollableFrame, "Child must be scrollable");
float scale;
dx->GetCanonicalPixelScale(scale);
nsBoxLayoutState bls(GetPresContext(), aRenderingContext);
nsMargin scrollbarSizes = scrollableFrame->GetDesiredScrollbarSizes(&bls);
float sbWidth;
float sbHeight;
dx->GetScrollBarDimensions(sbWidth, sbHeight);
nscoord scrollbarWidth = PRInt32(sbWidth * scale);
nscoord scrollbarHeight = PRInt32(sbHeight * scale);
aIntrinsicSize.height += scrollbarHeight;
aIntrinsicSize.width += scrollbarWidth;
aIntrinsicSize.width += scrollbarSizes.LeftRight();
aIntrinsicSize.height += scrollbarSizes.TopBottom();;
}
return NS_OK;