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

Fixed bug #4112

This commit is contained in:
kipp%netscape.com 1999-03-26 00:37:22 +00:00
Родитель 7266ef060d
Коммит 35bac488eb
2 изменённых файлов: 34 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -65,8 +65,7 @@ BRFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer)
{ {
if ((eFramePaintLayer_Overlay == aWhichLayer) && if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
nsIFrame::GetShowFrameBorders()) {
float p2t; float p2t;
aPresContext.GetPixelsToTwips(&p2t); aPresContext.GetPixelsToTwips(&p2t);
nscoord five = NSIntPixelsToTwips(5, p2t); nscoord five = NSIntPixelsToTwips(5, p2t);
@ -90,16 +89,23 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width = 0; aMetrics.width = 0;
aMetrics.ascent = 0; aMetrics.ascent = 0;
aMetrics.descent = 0; aMetrics.descent = 0;
NS_ASSERTION(nsnull != aReflowState.lineLayout, "no line layout");
aReflowState.lineLayout->SetBRFrame(this);
// Return our reflow status // Only when the BR is operating in a line-layout situation will it
PRUint32 breakType = aReflowState.mStyleDisplay->mBreakType; // behave like a BR.
if (NS_STYLE_CLEAR_NONE == breakType) { if (nsnull != aReflowState.lineLayout) {
breakType = NS_STYLE_CLEAR_LINE; aReflowState.lineLayout->SetBRFrame(this);
// Return our reflow status
PRUint32 breakType = aReflowState.mStyleDisplay->mBreakType;
if (NS_STYLE_CLEAR_NONE == breakType) {
breakType = NS_STYLE_CLEAR_LINE;
}
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
}
else {
aStatus = NS_FRAME_COMPLETE;
} }
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
return NS_OK; return NS_OK;
} }

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

@ -65,8 +65,7 @@ BRFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer)
{ {
if ((eFramePaintLayer_Overlay == aWhichLayer) && if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
nsIFrame::GetShowFrameBorders()) {
float p2t; float p2t;
aPresContext.GetPixelsToTwips(&p2t); aPresContext.GetPixelsToTwips(&p2t);
nscoord five = NSIntPixelsToTwips(5, p2t); nscoord five = NSIntPixelsToTwips(5, p2t);
@ -90,16 +89,23 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.width = 0; aMetrics.width = 0;
aMetrics.ascent = 0; aMetrics.ascent = 0;
aMetrics.descent = 0; aMetrics.descent = 0;
NS_ASSERTION(nsnull != aReflowState.lineLayout, "no line layout");
aReflowState.lineLayout->SetBRFrame(this);
// Return our reflow status // Only when the BR is operating in a line-layout situation will it
PRUint32 breakType = aReflowState.mStyleDisplay->mBreakType; // behave like a BR.
if (NS_STYLE_CLEAR_NONE == breakType) { if (nsnull != aReflowState.lineLayout) {
breakType = NS_STYLE_CLEAR_LINE; aReflowState.lineLayout->SetBRFrame(this);
// Return our reflow status
PRUint32 breakType = aReflowState.mStyleDisplay->mBreakType;
if (NS_STYLE_CLEAR_NONE == breakType) {
breakType = NS_STYLE_CLEAR_LINE;
}
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
}
else {
aStatus = NS_FRAME_COMPLETE;
} }
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
return NS_OK; return NS_OK;
} }