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

Fixed some problems with rounded borders. r=rods

Browse Source
This commit is contained in:
dcone@netscape.com
2000-01-14 14:43:05 +00:00
parent 67f706d955
commit bc62ad6d92
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
layout/base/nsCSSRendering.cpp
View File

@@ -2575,18 +2575,6 @@ PRInt16 thickness;
curIndex++; curIndex++;
aRenderingContext.FillPolygon(polypath,curIndex); aRenderingContext.FillPolygon(polypath,curIndex);
// anti-alias this
//r = NS_GET_R(sideColor);
//g = NS_GET_G(sideColor);
//b = NS_GET_B(sideColor);
//r += (255-r)>>1;
//g += (255-g)>>1;
//b += (255-b)>>1;
//sideColor = NS_RGB(r,g,b);
//aRenderingContext.SetColor(sideColor);
break; break;
case NS_STYLE_BORDER_STYLE_DOUBLE: case NS_STYLE_BORDER_STYLE_DOUBLE:
polypath[0].x = aPoints[0].x; polypath[0].x = aPoints[0].x;
@@ -2736,6 +2724,7 @@ PRInt16 adjust=0;
void void
RoundedRect::Set(nscoord aLeft,nscoord aTop,PRInt32 aWidth,PRInt32 aHeight,PRInt16 aRadius[4],PRInt16 aNumTwipPerPix) RoundedRect::Set(nscoord aLeft,nscoord aTop,PRInt32 aWidth,PRInt32 aHeight,PRInt16 aRadius[4],PRInt16 aNumTwipPerPix)
{ {
PRBool doRound;
nscoord x,y,width,height; nscoord x,y,width,height;
int i; int i;
@@ -2758,14 +2747,26 @@ int i;
} }
// are we drawing a circle // if we are drawing a circle
if( (aHeight==aWidth) && (mRoundness[0]>=(aWidth>>1)) ) { mDoRound = PR_FALSE;
mDoRound = PR_TRUE; if(aHeight==aWidth){
mRoundness[0] = aWidth>>1; for(i=0;i<4;i++){
} else { if(mRoundness[i]<(aWidth>>1)){
mDoRound = PR_FALSE; doRound = PR_FALSE;
break;
}
}
if(doRound){
mDoRound = PR_TRUE;
for(i=0;i<4;i++){
mRoundness[i] = aWidth>>1;
}
}
} }
// important coordinates that the path hits // important coordinates that the path hits
mLeft = x; mLeft = x;
mTop = y; mTop = y;

37
layout/html/style/src/nsCSSRendering.cpp
View File

@@ -2575,18 +2575,6 @@ PRInt16 thickness;
curIndex++; curIndex++;
aRenderingContext.FillPolygon(polypath,curIndex); aRenderingContext.FillPolygon(polypath,curIndex);
// anti-alias this
//r = NS_GET_R(sideColor);
//g = NS_GET_G(sideColor);
//b = NS_GET_B(sideColor);
//r += (255-r)>>1;
//g += (255-g)>>1;
//b += (255-b)>>1;
//sideColor = NS_RGB(r,g,b);
//aRenderingContext.SetColor(sideColor);
break; break;
case NS_STYLE_BORDER_STYLE_DOUBLE: case NS_STYLE_BORDER_STYLE_DOUBLE:
polypath[0].x = aPoints[0].x; polypath[0].x = aPoints[0].x;
@@ -2736,6 +2724,7 @@ PRInt16 adjust=0;
void void
RoundedRect::Set(nscoord aLeft,nscoord aTop,PRInt32 aWidth,PRInt32 aHeight,PRInt16 aRadius[4],PRInt16 aNumTwipPerPix) RoundedRect::Set(nscoord aLeft,nscoord aTop,PRInt32 aWidth,PRInt32 aHeight,PRInt16 aRadius[4],PRInt16 aNumTwipPerPix)
{ {
PRBool doRound;
nscoord x,y,width,height; nscoord x,y,width,height;
int i; int i;
@@ -2758,14 +2747,26 @@ int i;
} }
// are we drawing a circle // if we are drawing a circle
if( (aHeight==aWidth) && (mRoundness[0]>=(aWidth>>1)) ) { mDoRound = PR_FALSE;
mDoRound = PR_TRUE; if(aHeight==aWidth){
mRoundness[0] = aWidth>>1; for(i=0;i<4;i++){
} else { if(mRoundness[i]<(aWidth>>1)){
mDoRound = PR_FALSE; doRound = PR_FALSE;
break;
}
}
if(doRound){
mDoRound = PR_TRUE;
for(i=0;i<4;i++){
mRoundness[i] = aWidth>>1;
}
}
} }
// important coordinates that the path hits // important coordinates that the path hits
mLeft = x; mLeft = x;
mTop = y; mTop = y;