Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some uninitialized memory bugs that caused dialogs to be too tall.

Browse Source
This commit is contained in:
evaughan%netscape.com 1999-07-27 19:06:44 +00:00
parent 2731c5c46a
commit fa358cdae6
5 changed files with 38 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
layout/xul/base/src/nsBoxFrame.cpp
View File

@ -99,7 +99,7 @@ nsBoxFrame::Init(nsIPresContext& aPresContext,
* if so it used those instead. Currently it gets its values from css
*/
void
nsBoxFrame::GetRedefinedMinPrefMax(nsIFrame* aFrame, nsBoxInfo& aSize)
nsBoxFrame::GetRedefinedMinPrefMax(nsIFrame* aFrame, nsCalculatedBoxInfo& aSize)
{
// add in the css min, max, pref
const nsStylePosition* position;
@ -109,10 +109,12 @@ nsBoxFrame::GetRedefinedMinPrefMax(nsIFrame* aFrame, nsBoxInfo& aSize)
// see if the width or height was specifically set
if (position->mWidth.GetUnit() == eStyleUnit_Coord) {
aSize.prefSize.width = position->mWidth.GetCoordValue();
aSize.prefWidthIntrinsic = PR_FALSE;
}
if (position->mHeight.GetUnit() == eStyleUnit_Coord) {
aSize.prefSize.height = position->mHeight.GetCoordValue();
aSize.prefHeightIntrinsic = PR_FALSE;
}
// same for min size. Unfortunately min size is always set to 0. So for now
@ -182,28 +184,30 @@ nsBoxFrame::GetChildBoxInfo(nsIPresContext& aPresContext, const nsHTMLReflowStat
// start the preferred size as intrinsic
aSize.prefSize.width = NS_INTRINSICSIZE;
aSize.prefSize.height = NS_INTRINSICSIZE;
aSize.prefWidthIntrinsic = PR_TRUE;
aSize.prefHeightIntrinsic = PR_TRUE;
// redefine anything depending on css
GetRedefinedMinPrefMax(aFrame, aSize);
// if we are still intrinsically sized the flow to get the size otherwise
// we are done.
if (aSize.prefSize.width == NS_INTRINSICSIZE && aSize.prefSize.width == NS_INTRINSICSIZE)
if (aSize.prefSize.width == NS_INTRINSICSIZE || aSize.prefSize.height == NS_INTRINSICSIZE)
{
// subtract out the childs margin and border
const nsStyleSpacing* spacing;
nsresult rv = aFrame->GetStyleData(eStyleStruct_Spacing,
(const nsStyleStruct*&) spacing);
nsMargin margin;
nsMargin margin(0,0,0,0);;
spacing->GetMargin(margin);
nsMargin border;
nsMargin border(0,0,0,0);
spacing->GetBorderPadding(border);
nsMargin total = margin + border;
// add in childs margin and border
if (aSize.prefSize.height != NS_INTRINSICSIZE)
aSize.prefSize.height += (total.left + total.right);
if (aSize.prefSize.width != NS_INTRINSICSIZE)
aSize.prefSize.width += (total.left + total.right);
if (aSize.prefSize.height != NS_INTRINSICSIZE)
aSize.prefSize.height += (total.top + total.bottom);
@ -611,78 +615,6 @@ nsBoxFrame::ChildResized(nsHTMLReflowMetrics& aDesiredSize, nsRect& aRect, nsCal
}
/*
void
nsBoxFrame::ChildResized(nsHTMLReflowMetrics& aDesiredSize, nsRect& aRect, nsCalculatedBoxInfo& aInfo, PRBool[] aResized, nscoord& aChangedIndex, PRBool& aFinished, nscoord aIndex)
{
// this code is designed to work in both dimensions. It is written as if we were only dealing
// with a horizontal box. But if we get a vertical box the values will be inverted.
// width becomes height and height becomes width. The purpose of this code is to correctly relayout
// if a child get larger than what we told it to layout as. This can happend a lot with text. Say
// we have a div and we layout it out in a vertical box with a width of 100px. The text must wrap.
// this will make the height of the div taller than expected. We would normally only expect it to
// by its prefered height of 1 line. So we must shuffle things. The idea is to have a list of
// resized children. If a child gets gets bigger a bit will be set in the resized array. This
// tells the layout system not to recalculate the size of that child when we relayout out.
nscoord& desiredHeight = GET_HEIGHT(aDesiredSize);
nscoord& rectHeight = GET_HEIGHT(aRect);
nscoord& desiredWidth = GET_WIDTH(aDesiredSize);
nscoord& rectWidth = GET_WIDTH(aRect);
nscoord& calculatedWidth = GET_WIDTH(aInfo.calculatedSize);
if (desiredHeight > rectHeight) {
// ok if the height changed then we need to reflow everyone but us at the new height
// so we will set the changed index to be us. And signal that we need a new pass.
rectHeight = desiredHeight;
// because things flow from left to right top to bottom we know that
// if we get wider that we can set the min size. This will only work
// for width not height. Height must always be recalculated!
if (!mHorizontal)
aInfo.minSize.width = desiredHeight;
aFinished = PR_FALSE;
aChangedIndex = aIndex;
// if the height changed then clear out the resized list
// but only do this if we are horizontal box. In that case an increase in height
// can not affect
for (int i=0; i < mSprings; i++)
resized[i] = PR_FALSE;
// relayout everything
InvalidateChildren();
LayoutChildrenInRect(rect);
aReason = "child's height got bigger";
} else if (desiredWidth > calculatedWidth) {
// because things flow from left to right top to bottom we know that
// if we get wider that we can set the min size. This will only work
// for width not height. Height must always be recalculated!
if (mHorizontal)
aInfo.minSize.width = desiredWidth;
// our width now becomes the new size
calculatedWidth = desiredWidth;
InvalidateChildren();
// our index resized
resized[index] = PR_TRUE;
// if the width changed. mark our child as being resized
for (int i=0; i < mSprings; i++)
mSprings[i].sizeValid = resized[i];
LayoutChildrenInRect(rect);
aFinished = PR_FALSE;
aChangedIndex = count;
aReason = "child's width got bigger";
}
}
*/
/*
void CollapseChildren(nsIFrame* frame)
{
@ -815,7 +747,7 @@ nsBoxFrame::FlowChildAt(nsIFrame* childFrame,
nsresult rv = childFrame->GetStyleData(eStyleStruct_Spacing,
(const nsStyleStruct*&) spacing);
nsMargin margin;
nsMargin margin(0,0,0,0);
spacing->GetMargin(margin);
// get the current size of the child
@ -849,7 +781,7 @@ nsBoxFrame::FlowChildAt(nsIFrame* childFrame,
// ok now reflow the child into the springs calculated space
if (shouldReflow) {
nsMargin border;
nsMargin border(0,0,0,0);
spacing->GetBorderPadding(border);
nsMargin total = margin + border;
@ -862,11 +794,25 @@ nsBoxFrame::FlowChildAt(nsIFrame* childFrame,
nsSize size(aInfo.calculatedSize.width, aInfo.calculatedSize.height);
/*
// lets also look at our intrinsic flag. This flag is to make things like HR work.
// hr is funny if you flow it intrinsically you will get a size that is the height of
// the current font size. But if you then flow the hr with a computed height of what was returned the
// hr will be stretched out to fit. So basically the hr lays itself out differently depending
// on if you use intrinsic or or computed size. So to fix this we follow this policy. If any child
// does not implement nsIBox then we set this flag. Then on a flow if we decide to flow at the preferred width
// we flow it with a intrinsic width. This goes for height as well.
if (aInfo.prefWidthIntrinsic && size.width == aInfo.prefSize.width)
size.width = NS_INTRINSICSIZE;
if (aInfo.prefHeightIntrinsic && size.height == aInfo.prefSize.height)
size.height = NS_INTRINSICSIZE;
*/
// only subrtact margin
if (size.height != NS_INTRINSICSIZE)
size.height -= (margin.top + margin.bottom);
if (size.width != NS_INTRINSICSIZE)
size.width -= (margin.left + margin.right);
@ -880,7 +826,6 @@ nsBoxFrame::FlowChildAt(nsIFrame* childFrame,
if (size.width != NS_INTRINSICSIZE)
size.width -= (border.left + border.right);
// tell the child what size they should be
reflowState.mComputedWidth = size.width;
reflowState.mComputedHeight = size.height;
@ -1303,7 +1248,7 @@ nsBoxFrame::GetBoxInfo(nsIPresContext& aPresContext, const nsHTMLReflowState& aR
if (NS_FAILED(rv))
return rv;
nsMargin margin;
nsMargin margin(0,0,0,0);
spacing->GetMargin(margin);
nsSize m(margin.left+margin.right,margin.top+margin.bottom);
mSprings[count].minSize += m;
@ -1513,6 +1458,9 @@ nsCalculatedBoxInfo::clear()
calculatedSize.width = 0;
calculatedSize.height = 0;
prefWidthIntrinsic = PR_FALSE;
prefHeightIntrinsic = PR_FALSE;
sizeValid = PR_FALSE;
}

4
layout/xul/base/src/nsBoxFrame.h
View File

@ -38,6 +38,8 @@ class nsHTMLReflowCommand;
class nsCalculatedBoxInfo : public nsBoxInfo {
public:
nsSize calculatedSize;
PRBool prefWidthIntrinsic;
PRBool prefHeightIntrinsic;
PRBool sizeValid;
PRBool needsReflow;
PRBool needsRecalc;
@ -113,7 +115,7 @@ public:
protected:
nsBoxFrame(PRUint32 aFlags = 0);
virtual void GetRedefinedMinPrefMax(nsIFrame* aFrame, nsBoxInfo& aSize);
virtual void GetRedefinedMinPrefMax(nsIFrame* aFrame, nsCalculatedBoxInfo& aSize);
virtual nsresult GetChildBoxInfo(nsIPresContext& aPresContext, const nsHTMLReflowState& aReflowState, nsIFrame* aFrame, nsCalculatedBoxInfo& aSize);
virtual nsresult FlowChildren(nsIPresContext& aPresContext,
nsHTMLReflowMetrics& aDesiredSize,

5
layout/xul/base/src/nsIBox.h
View File

@ -42,8 +42,6 @@ public:
nsSize prefSize;
nsSize minSize;
nsSize maxSize;
PRBool prefWidthIntrinsic;
PRBool prefHeightIntrinsic;
float flex;
@ -61,9 +59,6 @@ public:
maxSize.width = NS_INTRINSICSIZE;
maxSize.height = NS_INTRINSICSIZE;
prefWidthIntrinsic = PR_FALSE;
prefHeightIntrinsic = PR_FALSE;
}
};

2
layout/xul/base/src/nsProgressMeterFrame.cpp
View File

@ -338,7 +338,7 @@ nsProgressMeterFrame :: Paint ( nsIPresContext& aPresContext,
// get our border
const nsStyleSpacing* spacing =
(const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing);
nsMargin border;
nsMargin border(0,0,0,0);
spacing->CalcBorderFor(this, border);
const nsStyleColor* colorStyle =

6
layout/xul/base/src/nsSliderFrame.cpp
View File

@ -211,9 +211,9 @@ nsSliderFrame::ReflowThumb(nsIPresContext& aPresContext,
nsresult rv = thumbFrame->GetStyleData(eStyleStruct_Spacing,
(const nsStyleStruct*&) spacing);
nsMargin margin;
nsMargin margin(0,0,0,0);
spacing->GetMargin(margin);
nsMargin border;
nsMargin border(0,0,0,0);
spacing->GetBorderPadding(border);
nsMargin total = margin + border;
@ -553,7 +553,7 @@ nsSliderFrame::CurrentPositionChanged(nsIPresContext* aPresContext)
nsresult rv = GetStyleData(eStyleStruct_Spacing,
(const nsStyleStruct*&) spacing);
nsMargin borderPadding;
nsMargin borderPadding(0,0,0,0);
spacing->GetBorderPadding(borderPadding);
// figure out the new rect