corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 8314. The block frame takes the bullet's position and area into account when it sets the combined area of the frame during reflow.

Browse Source
This commit is contained in:
nisheeth@netscape.com
1999-07-14 18:02:14 +00:00
parent 09614a5890
commit 3567dcbdfa
6 changed files with 306 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
layout/generic/nsBlockFrame.cpp
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {

51
layout/generic/nsBlockReflowState.cpp
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {

51
layout/generic/nsBlockReflowState.h
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {

51
layout/html/base/src/nsBlockFrame.cpp
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {

51
layout/html/base/src/nsBlockReflowState.cpp
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {

51
layout/html/base/src/nsBlockReflowState.h
View File

@@ -2640,6 +2640,52 @@ nsBlockFrame::GetTopBlockChild()
return nsnull;
}
static void ComputeCombinedArea(const nsRect aRect1, const nsRect aRect2, nsRect& aOutRect)
{
// Rect 1's top left point: (aRect.x, aRect1.y)
// Rect 2's top left point: (aRect2.x, aRect2.y)
// Rect 2's bottom right point: (x2, y2)
// Output rect's top left point: (aOutRect.x, aOutRect.y)
// Output rect's bottom right point: (xOut, yOut)
//
// Calculate the top left point of the output rect
//
// Initialize output rect's top left point to Rect 1's top left point
aOutRect.x = aRect1.x;
aOutRect.y = aRect1.y;
if (aRect2.x < aRect1.x) {
aOutRect.x = aRect2.x;
}
if (aRect2.y < aRect1.y) {
aOutRect.y = aRect2.y;
}
//
// Calculate the bottom right point of the output rect
//
// Initialize output rect's bottom right point to Rect 1's bottom right point
nscoord xOut = aRect1.x + aRect1.width;
nscoord yOut = aRect1.y + aRect1.height;
// Initialize Rect 2's bottom right point
nscoord x2 = aRect2.x + aRect2.width;
nscoord y2 = aRect2.y + aRect2.height;
if (x2 > xOut) {
xOut = x2;
}
if (y2 > yOut) {
yOut = y2;
}
//
// Set the width and height on the output rect.
//
aOutRect.width = xOut - aOutRect.x;
aOutRect.height = yOut - aOutRect.y;
}
nsresult
nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
nsLineBox* aLine,
@@ -2829,6 +2875,11 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
bbox.y = aState.BorderPadding().top + ascent -
metrics.ascent + topMargin;
mBullet->SetRect(bbox);
// Fix for bug 8314. Include the bullet's area in the combined area
// of the current line.
ComputeCombinedArea((const nsRect) bbox, (const nsRect) aLine->mCombinedArea,
aLine->mCombinedArea);
}
}
else {