Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 94654. outliner: don't draw image if column is too narrow

Browse Source 
r=bryner, sr=hyatt
This commit is contained in:
varga%utcru.sk 2002-02-09 04:52:24 +00:00
parent 734e1be2e2
commit 2447521c5e
2 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
View File

@ -2178,8 +2178,8 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
nsRect imageSize(0,0,0,0); nsRect imageSize(0,0,0,0);
PRInt32 x = currX; PRInt32 lineX = currX;
PRInt32 y = (aRowIndex - mTopRowIndex) * mRowHeight; PRInt32 lineY = (aRowIndex - mTopRowIndex) * mRowHeight;
// Compute the maximal level to paint. // Compute the maximal level to paint.
PRInt32 maxLevel = level; PRInt32 maxLevel = level;
@ -2208,15 +2208,18 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
imageSize.width = mIndentation; imageSize.width = mIndentation;
// Line up line with the parent image. // Line up line with the parent image.
x = currX + twistySize.width + imageSize.width / 2; lineX = currX + twistySize.width + imageSize.width / 2;
// Paint full vertical line only if we have next sibling. nscoord srcX = lineX - (level - i + 1) * mIndentation;
PRBool hasNextSibling; if (srcX <= cellRect.x + cellRect.width) {
mView->HasNextSibling(currentParent, aRowIndex, &hasNextSibling); // Paint full vertical line only if we have next sibling.
if (hasNextSibling) PRBool hasNextSibling;
aRenderingContext.DrawLine(x - (level - i + 1) * mIndentation, y, x - (level - i + 1) * mIndentation, y + mRowHeight); mView->HasNextSibling(currentParent, aRowIndex, &hasNextSibling);
else if (i == level) if (hasNextSibling)
aRenderingContext.DrawLine(x - (level - i + 1) * mIndentation, y, x - (level - i + 1) * mIndentation, y + mRowHeight / 2); aRenderingContext.DrawLine(srcX, lineY, srcX, lineY + mRowHeight);
else if (i == level)
aRenderingContext.DrawLine(srcX, lineY, srcX, lineY + mRowHeight / 2);
}
} }
PRInt32 parent; PRInt32 parent;
@ -2227,8 +2230,15 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
} }
// Don't paint off our cell. // Don't paint off our cell.
if (level == maxLevel) if (level == maxLevel) {
aRenderingContext.DrawLine(x - mIndentation + 16, y + mRowHeight / 2, x - imageSize.width / 2, y + mRowHeight / 2); nscoord srcX = lineX - mIndentation + 16;
if (srcX <= cellRect.x + cellRect.width) {
nscoord destX = lineX - imageSize.width / 2;
if (destX > cellRect.x + cellRect.width)
destX = cellRect.x + cellRect.width;
aRenderingContext.DrawLine(srcX, lineY + mRowHeight / 2, destX, lineY + mRowHeight / 2);
}
}
PRBool clipState; PRBool clipState;
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
@ -2313,7 +2323,12 @@ nsOutlinerBodyFrame::PaintTwisty(int aRowIndex,
// a -moz-apperance involved, adjust the rect by the minimum widget size provided by // a -moz-apperance involved, adjust the rect by the minimum widget size provided by
// the theme implementation. // the theme implementation.
nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), twistyContext); nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), twistyContext);
twistyRect.width = imageSize.width; if (imageSize.height > twistyRect.height)
imageSize.height = twistyRect.height;
if (imageSize.width > twistyRect.width)
imageSize.width = twistyRect.width;
else
twistyRect.width = imageSize.width;
if ( useTheme ) { if ( useTheme ) {
nsSize minTwistySize(0,0); nsSize minTwistySize(0,0);
PRBool canOverride = PR_TRUE; PRBool canOverride = PR_TRUE;
@ -2412,8 +2427,13 @@ nsOutlinerBodyFrame::PaintImage(int aRowIndex,
// we use the image's natural width. // we use the image's natural width.
// If the image hasn't loaded and if no width is specified, then we just bail. // If the image hasn't loaded and if no width is specified, then we just bail.
nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), imageContext); nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), imageContext);
if (!aColumn->IsCycler())
imageRect.width = imageSize.width; if (imageSize.height > imageRect.height)
imageSize.height = imageRect.height;
if (imageSize.width > imageRect.width)
imageSize.width = imageRect.width;
else if (!aColumn->IsCycler())
imageRect.width = imageSize.width;
// Subtract out the remaining width. // Subtract out the remaining width.
nsRect copyRect(imageRect); nsRect copyRect(imageRect);

50
layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
View File

@ -2178,8 +2178,8 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
nsRect imageSize(0,0,0,0); nsRect imageSize(0,0,0,0);
PRInt32 x = currX; PRInt32 lineX = currX;
PRInt32 y = (aRowIndex - mTopRowIndex) * mRowHeight; PRInt32 lineY = (aRowIndex - mTopRowIndex) * mRowHeight;
// Compute the maximal level to paint. // Compute the maximal level to paint.
PRInt32 maxLevel = level; PRInt32 maxLevel = level;
@ -2208,15 +2208,18 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
imageSize.width = mIndentation; imageSize.width = mIndentation;
// Line up line with the parent image. // Line up line with the parent image.
x = currX + twistySize.width + imageSize.width / 2; lineX = currX + twistySize.width + imageSize.width / 2;
// Paint full vertical line only if we have next sibling. nscoord srcX = lineX - (level - i + 1) * mIndentation;
PRBool hasNextSibling; if (srcX <= cellRect.x + cellRect.width) {
mView->HasNextSibling(currentParent, aRowIndex, &hasNextSibling); // Paint full vertical line only if we have next sibling.
if (hasNextSibling) PRBool hasNextSibling;
aRenderingContext.DrawLine(x - (level - i + 1) * mIndentation, y, x - (level - i + 1) * mIndentation, y + mRowHeight); mView->HasNextSibling(currentParent, aRowIndex, &hasNextSibling);
else if (i == level) if (hasNextSibling)
aRenderingContext.DrawLine(x - (level - i + 1) * mIndentation, y, x - (level - i + 1) * mIndentation, y + mRowHeight / 2); aRenderingContext.DrawLine(srcX, lineY, srcX, lineY + mRowHeight);
else if (i == level)
aRenderingContext.DrawLine(srcX, lineY, srcX, lineY + mRowHeight / 2);
}
} }
PRInt32 parent; PRInt32 parent;
@ -2227,8 +2230,15 @@ NS_IMETHODIMP nsOutlinerBodyFrame::PaintCell(int aRowIndex,
} }
// Don't paint off our cell. // Don't paint off our cell.
if (level == maxLevel) if (level == maxLevel) {
aRenderingContext.DrawLine(x - mIndentation + 16, y + mRowHeight / 2, x - imageSize.width / 2, y + mRowHeight / 2); nscoord srcX = lineX - mIndentation + 16;
if (srcX <= cellRect.x + cellRect.width) {
nscoord destX = lineX - imageSize.width / 2;
if (destX > cellRect.x + cellRect.width)
destX = cellRect.x + cellRect.width;
aRenderingContext.DrawLine(srcX, lineY + mRowHeight / 2, destX, lineY + mRowHeight / 2);
}
}
PRBool clipState; PRBool clipState;
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
@ -2313,7 +2323,12 @@ nsOutlinerBodyFrame::PaintTwisty(int aRowIndex,
// a -moz-apperance involved, adjust the rect by the minimum widget size provided by // a -moz-apperance involved, adjust the rect by the minimum widget size provided by
// the theme implementation. // the theme implementation.
nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), twistyContext); nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), twistyContext);
twistyRect.width = imageSize.width; if (imageSize.height > twistyRect.height)
imageSize.height = twistyRect.height;
if (imageSize.width > twistyRect.width)
imageSize.width = twistyRect.width;
else
twistyRect.width = imageSize.width;
if ( useTheme ) { if ( useTheme ) {
nsSize minTwistySize(0,0); nsSize minTwistySize(0,0);
PRBool canOverride = PR_TRUE; PRBool canOverride = PR_TRUE;
@ -2412,8 +2427,13 @@ nsOutlinerBodyFrame::PaintImage(int aRowIndex,
// we use the image's natural width. // we use the image's natural width.
// If the image hasn't loaded and if no width is specified, then we just bail. // If the image hasn't loaded and if no width is specified, then we just bail.
nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), imageContext); nsRect imageSize = GetImageSize(aRowIndex, aColumn->GetID().get(), imageContext);
if (!aColumn->IsCycler())
imageRect.width = imageSize.width; if (imageSize.height > imageRect.height)
imageSize.height = imageRect.height;
if (imageSize.width > imageRect.width)
imageSize.width = imageRect.width;
else if (!aColumn->IsCycler())
imageRect.width = imageSize.width;
// Subtract out the remaining width. // Subtract out the remaining width.
nsRect copyRect(imageRect); nsRect copyRect(imageRect);