From 0f84787aa8e7d81000a58f335e9165ea60019d8d Mon Sep 17 00:00:00 2001 From: kipp Date: Thu, 28 May 1998 02:01:50 +0000 Subject: [PATCH] Use revised HorziontallyPlaceChildren api git-svn-id: svn://10.0.0.236/trunk@2465 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineLayout.cpp | 6 +++++- mozilla/layout/html/base/src/nsLineLayout.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 57a98e87cd0..fe06ea177e7 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -1520,6 +1520,8 @@ nsLineLayout::AlignChildren() blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) blockSC->GetData(eStyleStruct_Text); + nsStyleDisplay* blockDisplay = (nsStyleDisplay*) + blockSC->GetData(eStyleStruct_Display); // First vertically align the children on the line; this will // compute the actual line height for us. @@ -1531,7 +1533,9 @@ nsLineLayout::AlignChildren() mAscents, mState.mMaxAscent); // Now horizontally place the children - nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, blockText, + nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, + blockText->mTextAlign, + blockDisplay->mDirection, mLine->mFirstChild, mLine->mChildCount, mState.mX - mLeftEdge, diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 57a98e87cd0..fe06ea177e7 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -1520,6 +1520,8 @@ nsLineLayout::AlignChildren() blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) blockSC->GetData(eStyleStruct_Text); + nsStyleDisplay* blockDisplay = (nsStyleDisplay*) + blockSC->GetData(eStyleStruct_Display); // First vertically align the children on the line; this will // compute the actual line height for us. @@ -1531,7 +1533,9 @@ nsLineLayout::AlignChildren() mAscents, mState.mMaxAscent); // Now horizontally place the children - nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, blockText, + nsCSSLayout::HorizontallyPlaceChildren(mPresContext, mBlock, + blockText->mTextAlign, + blockDisplay->mDirection, mLine->mFirstChild, mLine->mChildCount, mState.mX - mLeftEdge,