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

Numberous fixes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@45211 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
evaughan%netscape.com
1999-08-30 22:32:25 +00:00
parent 56fead1da7
commit 060e54bdfa
5 changed files with 132 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/html/base/src/nsScrollFrame.cpp
View File

@@ -34,6 +34,7 @@
#include "nsScrollFrame.h"
#include "nsLayoutAtoms.h"
#include "nsIWebShell.h"
#include "nsIBox.h"
static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID);
@@ -577,7 +578,16 @@ nsScrollFrame::Reflow(nsIPresContext& aPresContext,
// Reflow the child and get its desired size. Let it be as high as it
// wants
PRBool unconstrainedWidth = (NS_UNCONSTRAINEDSIZE == scrollAreaSize.width);
nsSize kidReflowSize(scrollAreaSize.width, NS_UNCONSTRAINEDSIZE);
nscoord theHeight;
nsIBox* box;
nsresult result = kidFrame->QueryInterface(kIBoxIID, (void**)&box);
if (NS_SUCCEEDED(result))
theHeight = scrollAreaSize.height;
else
theHeight = NS_INTRINSICSIZE;
nsSize kidReflowSize(scrollAreaSize.width, theHeight);
nsHTMLReflowState kidReflowState(aPresContext, aReflowState,
kidFrame, kidReflowSize);
nsHTMLReflowMetrics kidDesiredSize(aDesiredSize.maxElementSize);
@@ -589,7 +599,7 @@ nsScrollFrame::Reflow(nsIPresContext& aPresContext,
aReflowState.mComputedPadding.left -
aReflowState.mComputedPadding.right;
}
kidReflowState.mComputedHeight = NS_AUTOHEIGHT;
kidReflowState.mComputedHeight = theHeight;
ReflowChild(kidFrame, aPresContext, kidDesiredSize, kidReflowState,
aStatus);