wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 770453 - [b2g] Semi-transparent scroll bars should not occupy content-flow space. r=roc

Browse Source
This commit is contained in:
Markus Stange 2012-08-03 12:35:14 +02:00
parent f55d9d2db2
commit c523884f92
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsGfxScrollFrame.cpp
View File

@ -478,8 +478,9 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState,
computedMaxHeight = NS_UNCONSTRAINEDSIZE; computedMaxHeight = NS_UNCONSTRAINEDSIZE;
} }
if (aAssumeHScroll) { if (aAssumeHScroll) {
nsSize hScrollbarPrefSize = nsSize hScrollbarPrefSize;
mInner.mHScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState->mBoxState)); GetScrollbarMetrics(aState->mBoxState, mInner.mHScrollbarBox,
nsnull, &hScrollbarPrefSize, false);
if (computedHeight != NS_UNCONSTRAINEDSIZE) if (computedHeight != NS_UNCONSTRAINEDSIZE)
computedHeight = NS_MAX(0, computedHeight - hScrollbarPrefSize.height); computedHeight = NS_MAX(0, computedHeight - hScrollbarPrefSize.height);
computedMinHeight = NS_MAX(0, computedMinHeight - hScrollbarPrefSize.height); computedMinHeight = NS_MAX(0, computedMinHeight - hScrollbarPrefSize.height);
@ -488,8 +489,9 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState,
} }
if (aAssumeVScroll) { if (aAssumeVScroll) {
nsSize vScrollbarPrefSize = nsSize vScrollbarPrefSize;
mInner.mVScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState->mBoxState)); GetScrollbarMetrics(aState->mBoxState, mInner.mVScrollbarBox,
&vScrollbarPrefSize, nsnull, true);
availWidth = NS_MAX(0, availWidth - vScrollbarPrefSize.width); availWidth = NS_MAX(0, availWidth - vScrollbarPrefSize.width);
} }