From 77105b9e5865c472c23dec6ee6252ba16c3e3960 Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Fri, 15 Mar 2002 08:03:18 +0000 Subject: [PATCH] Fix bug 101180 - the minimum line-height wasn't applied at the first reflow, causing the line to flicker at the next reflow, r=dbaron, sr=attinasi, a=asa git-svn-id: svn://10.0.0.236/trunk@116634 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineLayout.cpp | 4 ++-- mozilla/layout/html/base/src/nsLineLayout.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 6b8f5993d47..e497ccd2d88 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -2636,8 +2636,8 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd) if ( NS_SUCCEEDED(result) && blockTagAtom) { // (2) above, if the first line of LI if (isFirstLine && blockTagAtom.get() == nsHTMLAtoms::li) { - // if the line is empty, then don't force the min width (see bug 75963) - if ((mLineBox->mBounds.height > 0) || (mLineBox->mBounds.width > 0)) { + // if the line is empty, then don't force the min height (see bug 75963) + if (!IsZeroHeight()) { applyMinLH = PR_TRUE; foundLI = PR_TRUE; } diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 6b8f5993d47..e497ccd2d88 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -2636,8 +2636,8 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd) if ( NS_SUCCEEDED(result) && blockTagAtom) { // (2) above, if the first line of LI if (isFirstLine && blockTagAtom.get() == nsHTMLAtoms::li) { - // if the line is empty, then don't force the min width (see bug 75963) - if ((mLineBox->mBounds.height > 0) || (mLineBox->mBounds.width > 0)) { + // if the line is empty, then don't force the min height (see bug 75963) + if (!IsZeroHeight()) { applyMinLH = PR_TRUE; foundLI = PR_TRUE; }