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

bug 88524 - don't skip the reflow of the inner table if it is pct height. sr=timeout, r=alexsavulov

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@100396 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com 2001-08-06 14:23:50 +00:00
parent d73eed89ce
commit 085d032423
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -1428,7 +1428,22 @@ PRBool nsTableOuterFrame::IR_CaptionChangedAxis(const nsStyleTable* aOldStyle,
}
static PRBool
IsPctHeight(nsIFrame* aFrame)
{
if (aFrame) {
nsCOMPtr<nsIStyleContext> styleContext;
aFrame->GetStyleContext(getter_AddRefs(styleContext));
nsStylePosition* position = (nsStylePosition*)styleContext->GetStyleData(eStyleStruct_Position);
if (eStyleUnit_Percent == position->mHeight.GetUnit()) {
float percent = position->mHeight.GetPercentValue();
if (percent > 0.0f) {
return PR_TRUE;
}
}
}
return PR_FALSE;
}
/**
* Reflow is a multi-step process.
@ -1472,7 +1487,8 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext* aPresContext,
if ((eReflowReason_Resize == aOuterRS.reason) &&
(aOuterRS.availableWidth == mPriorAvailWidth) &&
!isPaginated) {
!isPaginated &&
!::IsPctHeight(mInnerTableFrame)) {
// don't do much if we are resize reflowed exactly like last time
aDesiredSize.width = mRect.width;
aDesiredSize.height = mRect.height;

20
mozilla/layout/tables/nsTableOuterFrame.cpp
View File

@ -1428,7 +1428,22 @@ PRBool nsTableOuterFrame::IR_CaptionChangedAxis(const nsStyleTable* aOldStyle,
}
static PRBool
IsPctHeight(nsIFrame* aFrame)
{
if (aFrame) {
nsCOMPtr<nsIStyleContext> styleContext;
aFrame->GetStyleContext(getter_AddRefs(styleContext));
nsStylePosition* position = (nsStylePosition*)styleContext->GetStyleData(eStyleStruct_Position);
if (eStyleUnit_Percent == position->mHeight.GetUnit()) {
float percent = position->mHeight.GetPercentValue();
if (percent > 0.0f) {
return PR_TRUE;
}
}
}
return PR_FALSE;
}
/**
* Reflow is a multi-step process.
@ -1472,7 +1487,8 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext* aPresContext,
if ((eReflowReason_Resize == aOuterRS.reason) &&
(aOuterRS.availableWidth == mPriorAvailWidth) &&
!isPaginated) {
!isPaginated &&
!::IsPctHeight(mInnerTableFrame)) {
// don't do much if we are resize reflowed exactly like last time
aDesiredSize.width = mRect.width;
aDesiredSize.height = mRect.height;