mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed nowrap support by computing max-element-size better

This commit is contained in:
kipp%netscape.com 1998-11-06 02:09:21 +00:00
Родитель c734f425a7
Коммит 07564642ae
6 изменённых файлов: 228 добавлений и 78 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

51
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children

51
layout/generic/nsBlockReflowState.cpp
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children

51
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children

51
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children

51
layout/html/base/src/nsBlockReflowState.cpp
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children

51
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -2088,16 +2088,31 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
aMetrics.ascent = aMetrics.height;
aMetrics.descent = 0;
// XXX this needs reworking I suppose
// XXX this needs ALOT OF REWORKING
if (aState.mComputeMaxElementSize) {
*aMetrics.maxElementSize = aState.mMaxElementSize;
nscoord maxWidth, maxHeight;
// Add in our border and padding to the max-element-size so that
// we don't shrink too far.
aMetrics.maxElementSize->width += aState.mBorderPadding.left +
aState.mBorderPadding.right;
aMetrics.maxElementSize->height += aState.mBorderPadding.top +
aState.mBorderPadding.bottom;
if (aState.mNoWrap) {
maxWidth = 0;
maxHeight = 0;
LineData* line = mLines;
while (nsnull != line) {
nscoord xm = line->mBounds.XMost();
if (xm > maxWidth) {
maxWidth = xm;
}
line = line->mNext;
}
// XXX winging it!
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
else {
maxWidth = aState.mMaxElementSize.width +
aState.mBorderPadding.left + aState.mBorderPadding.right;
maxHeight = aState.mMaxElementSize.height +
aState.mBorderPadding.top + aState.mBorderPadding.bottom;
}
// Factor in any left and right floaters as well
LineData* line = mLines;
@ -2136,13 +2151,23 @@ nsBlockFrame::ComputeFinalSize(nsBlockReflowState& aState,
}
line = line->mNext;
}
// XXX what to do???
if (maxLeft > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxLeft;
// XXX this part is an approximation
if (aState.mNoWrap) {
maxWidth += maxLeft + maxRight;
}
if (maxRight > aMetrics.maxElementSize->width) {
aMetrics.maxElementSize->width = maxRight;
else {
if (maxLeft > maxWidth) {
maxWidth = maxLeft;
}
if (maxRight > maxWidth) {
maxWidth = maxRight;
}
}
// Store away the final value
aMetrics.maxElementSize->width = maxWidth;
aMetrics.maxElementSize->height = maxHeight;
}
// Compute the combined area of our children