Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up the rendering; don't take space when show-borders is on

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6751 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-07-29 19:33:27 +00:00
parent 159a848417
commit 70f2d42c59
3 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/layout/generic/nsPlaceholderFrame.cpp
View File

@@ -142,16 +142,9 @@ nsPlaceholderFrame::InlineReflow(nsCSSLineLayout& aLineLayout,
container->AddFloater(&presContext, aReflowState, mAnchoredItem, this);
}
if (nsIFrame::GetShowFrameBorders()) {
float p2t = presContext.GetPixelsToTwips();
aDesiredSize.width = nscoord(p2t * 5);
aDesiredSize.height = aDesiredSize.width;
}
else {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.width = 0;
aDesiredSize.height = 0;
aDesiredSize.ascent = 0;
aDesiredSize.descent = 0;
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
@@ -166,8 +159,12 @@ nsPlaceholderFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect)
{
if (nsIFrame::GetShowFrameBorders()) {
float p2t = aPresContext.GetPixelsToTwips();
aRenderingContext.SetColor(NS_RGB(0, 255, 255));
aRenderingContext.FillRect(0, 0, mRect.width, mRect.height);
nscoord x = nscoord(-5 * p2t);
aRenderingContext.FillRect(x, 0, nscoord(13 * p2t), nscoord(3 * p2t));
nscoord y = nscoord(-10 * p2t);
aRenderingContext.FillRect(0, y, nscoord(3 * p2t), nscoord(10 * p2t));
}
return NS_OK;
}

12
mozilla/layout/html/base/src/nsBRPart.cpp
View File

@@ -81,10 +81,8 @@ BRFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect)
{
if (nsIFrame::GetShowFrameBorders()) {
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);
float p2t = aPresContext.GetPixelsToTwips();
aRenderingContext.SetColor(color->mColor);
aRenderingContext.SetColor(NS_RGB(0, 255, 255));
aRenderingContext.FillRect(0, 0, nscoord(5 * p2t), mRect.height);
}
return NS_OK;
@@ -113,16 +111,10 @@ BRFrame::InlineReflow(nsCSSLineLayout& aLineLayout,
mStyleContext->GetStyleData(eStyleStruct_Font);
nsIFontMetrics* fm = aLineLayout.mPresContext->GetMetricsFor(font->mFont);
aMetrics.width = 0;
if (nsIFrame::GetShowFrameBorders()) {
// Reserve a tiny bit of space so that our frame won't be zero
// sized so we get a chance to paint.
aMetrics.width = 1;
}
aMetrics.ascent = fm->GetMaxAscent();
aMetrics.descent = fm->GetMaxDescent();
aMetrics.height = aMetrics.ascent + aMetrics.descent;
aMetrics.width = 0;
NS_RELEASE(fm);
// Return our inline reflow status

19
mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
View File

@@ -142,16 +142,9 @@ nsPlaceholderFrame::InlineReflow(nsCSSLineLayout& aLineLayout,
container->AddFloater(&presContext, aReflowState, mAnchoredItem, this);
}
if (nsIFrame::GetShowFrameBorders()) {
float p2t = presContext.GetPixelsToTwips();
aDesiredSize.width = nscoord(p2t * 5);
aDesiredSize.height = aDesiredSize.width;
}
else {
aDesiredSize.width = 0;
aDesiredSize.height = 0;
}
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.width = 0;
aDesiredSize.height = 0;
aDesiredSize.ascent = 0;
aDesiredSize.descent = 0;
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
@@ -166,8 +159,12 @@ nsPlaceholderFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect)
{
if (nsIFrame::GetShowFrameBorders()) {
float p2t = aPresContext.GetPixelsToTwips();
aRenderingContext.SetColor(NS_RGB(0, 255, 255));
aRenderingContext.FillRect(0, 0, mRect.width, mRect.height);
nscoord x = nscoord(-5 * p2t);
aRenderingContext.FillRect(x, 0, nscoord(13 * p2t), nscoord(3 * p2t));
nscoord y = nscoord(-10 * p2t);
aRenderingContext.FillRect(0, y, nscoord(3 * p2t), nscoord(10 * p2t));
}
return NS_OK;
}