mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 23:39:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Skip transparent borders early and change border side plot order.

Browse Source 
svn path=/trunk/netsurf/; revision=10695
This commit is contained in:
Michael Drake 2010-08-13 19:02:39 +00:00
parent ab24d46f76
commit 3d8a39e225
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
render/html_redraw.c
View File

@ -1050,12 +1050,13 @@ bool html_redraw_caret(struct caret *c, colour current_background_color,
bool html_redraw_borders(struct box *box, int x_parent, int y_parent,
int p_width, int p_height, float scale)
{
unsigned int sides[] = { TOP, BOTTOM, LEFT, RIGHT };
int top = box->border[TOP].width;
int right = box->border[RIGHT].width;
int bottom = box->border[BOTTOM].width;
int left = box->border[LEFT].width;
int x, y;
unsigned int i;
unsigned int i, side;
int p[20];
if (scale != 1.0) {
@ -1079,23 +1080,22 @@ bool html_redraw_borders(struct box *box, int x_parent, int y_parent,
p[10] = x + p_width + right; p[11] = y + p_height + bottom;
p[12] = x - left; p[13] = y + p_height + bottom;
p[14] = x; p[15] = y + p_height;
p[16] = x; p[17] = y;
p[18] = x - left; p[19] = y - top;
p[16] = p[0]; p[17] = p[1];
p[18] = p[2]; p[19] = p[3];
for (i = 0; i != 4; i++) {
side = sides[i]; /* plot order */
colour col = 0;
if (box->border[i].width == 0)
if (box->border[side].width == 0 || box->border[side].color ==
CSS_BORDER_COLOR_TRANSPARENT)
continue;
if (box->border[i].color == CSS_BORDER_COLOR_TRANSPARENT) {
col = NS_TRANSPARENT;
} else {
col = nscss_color_to_ns(box->border[i].c);
}
col = nscss_color_to_ns(box->border[side].c);
if (!html_redraw_border_plot(i, p, col, box->border[i].style,
box->border[i].width * scale))
if (!html_redraw_border_plot(side, p, col,
box->border[side].style,
box->border[side].width * scale))
return false;
}