Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 40721 - put back fix that was erroneously backed out. r=rods from before.

Browse Source
This commit is contained in:
karnaze%netscape.com 2000-07-06 13:58:54 +00:00
parent c4a05b9a09
commit 93d58ddc9c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/html/table/src/nsTableRowFrame.cpp
View File

@ -1437,13 +1437,18 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext,
PRBool tallestCellGotShorter = PR_FALSE;
#ifndef MOZ_MATHML
if (initCellDesSize.height < oldCellDesSize.height) {
nscoord width = initCellDesSize.width;
nscoord height = initCellDesSize.height;
CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style
nscoord tallest = GetTallestCell();
if ((height == tallest) && (cellMet.height < tallest)) {
if (oldCellDesSize.height == GetTallestCell()) {
tallestCellGotShorter = PR_TRUE;
}
else {
nscoord width = initCellDesSize.width;
nscoord height = initCellDesSize.height;
CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style
nscoord tallest = GetTallestCell();
if ((height == tallest) && (cellMet.height < tallest)) {
tallestCellGotShorter = PR_TRUE;
}
}
}
if (tallestCellGotShorter) {
CalcTallestCell();

15
layout/tables/nsTableRowFrame.cpp
View File

@ -1437,13 +1437,18 @@ NS_METHOD nsTableRowFrame::IR_TargetIsChild(nsIPresContext* aPresContext,
PRBool tallestCellGotShorter = PR_FALSE;
#ifndef MOZ_MATHML
if (initCellDesSize.height < oldCellDesSize.height) {
nscoord width = initCellDesSize.width;
nscoord height = initCellDesSize.height;
CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style
nscoord tallest = GetTallestCell();
if ((height == tallest) && (cellMet.height < tallest)) {
if (oldCellDesSize.height == GetTallestCell()) {
tallestCellGotShorter = PR_TRUE;
}
else {
nscoord width = initCellDesSize.width;
nscoord height = initCellDesSize.height;
CalculateCellActualSize(aNextFrame, width, height, cellAvailWidth); // considers style
nscoord tallest = GetTallestCell();
if ((height == tallest) && (cellMet.height < tallest)) {
tallestCellGotShorter = PR_TRUE;
}
}
}
if (tallestCellGotShorter) {
CalcTallestCell();