corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed nsLeafFrane's GetdesiredSize() to not pass in the max size

Browse Source 
since it's now part of nsReflowState
This commit is contained in:
troy
1998-06-01 23:31:30 +00:00
parent d03b8c2280
commit 4b652c6bbc
14 changed files with 28 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/html/forms/src/nsInputButton.cpp
View File

@@ -128,7 +128,6 @@ protected:
virtual void GetDesiredSize(nsIPresContext* aPresContext,
const nsReflowState& aReflowState,
const nsSize& aMaxSize,
nsReflowMetrics& aDesiredLayoutSize,
nsSize& aDesiredWidgetSize);
@@ -419,8 +418,7 @@ nsInputButtonFrame::Reflow(nsIPresContext* aPresContext,
if ((kButtonTag_Input == GetButtonTagType()) &&
(kButton_Image == GetButtonType())) {
nsSize ignore;
GetDesiredSize(aPresContext, aReflowState, aReflowState.maxSize,
aDesiredSize, ignore);
GetDesiredSize(aPresContext, aReflowState, aDesiredSize, ignore);
AddBordersAndPadding(aPresContext, aDesiredSize);
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
@@ -438,7 +436,6 @@ nsInputButtonFrame::Reflow(nsIPresContext* aPresContext,
void
nsInputButtonFrame::GetDesiredSize(nsIPresContext* aPresContext,
const nsReflowState& aReflowState,
const nsSize& aMaxSize,
nsReflowMetrics& aDesiredLayoutSize,
nsSize& aDesiredWidgetSize)
{
@@ -456,8 +453,7 @@ nsInputButtonFrame::GetDesiredSize(nsIPresContext* aPresContext,
if (eContentAttr_HasValue == mContent->GetAttribute("SRC", src)) {
mImageLoader.SetURL(src);
}
mImageLoader.GetDesiredSize(aPresContext, aReflowState, aMaxSize,
aDesiredLayoutSize);
mImageLoader.GetDesiredSize(aPresContext, aReflowState, aDesiredLayoutSize);
}
else { // there is a widget
nsSize styleSize;