AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

rendernode: Compute border node colors properly

Browse Source 
Change the way we compute border color cutoffs to the same method that
browsers use. This method does not consider the corner sizes at all and
only looks at border-width.
This commit is contained in:
Benjamin Otte 2019-05-02 19:22:43 +02:00
parent 8915d60900
commit 19227d9789
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gsk/gskrendernodeimpl.c
View File

@ -580,22 +580,32 @@ gsk_border_node_draw (GskRenderNode *node,
* Note that the call to cairo_fill() will add the potential final * Note that the call to cairo_fill() will add the potential final
* segment by closing the path, so we don't have to care. * segment by closing the path, so we don't have to care.
*/ */
float dst = MIN (bounds->size.width, bounds->size.height) / 2.0;
cairo_pattern_t *mesh; cairo_pattern_t *mesh;
cairo_matrix_t mat; cairo_matrix_t mat;
graphene_point_t tl, br;
float scale;
mesh = cairo_pattern_create_mesh (); mesh = cairo_pattern_create_mesh ();
cairo_matrix_init_translate (&mat, -bounds->origin.x, -bounds->origin.y); cairo_matrix_init_translate (&mat, -bounds->origin.x, -bounds->origin.y);
cairo_pattern_set_matrix (mesh, &mat); cairo_pattern_set_matrix (mesh, &mat);
scale = MIN (bounds->size.width / (self->border_width[1] + self->border_width[3]),
bounds->size.height / (self->border_width[0] + self->border_width[2]));
graphene_point_init (&tl,
self->border_width[3] * scale,
self->border_width[0] * scale);
graphene_point_init (&br,
bounds->size.width - self->border_width[1] * scale,
bounds->size.height - self->border_width[2] * scale);
/* Top */ /* Top */
if (self->border_width[0] > 0) if (self->border_width[0] > 0)
{ {
gsk_border_node_mesh_add_patch (mesh, gsk_border_node_mesh_add_patch (mesh,
&self->border_color[0], &self->border_color[0],
0, 0, 0, 0,
dst * self->border_width[3] / self->border_width[0], dst, tl.x, tl.y,
bounds->size.width - dst * self->border_width[1] / self->border_width[0], dst, br.x, tl.y,
bounds->size.width, 0); bounds->size.width, 0);
} }
@ -605,8 +615,8 @@ gsk_border_node_draw (GskRenderNode *node,
gsk_border_node_mesh_add_patch (mesh, gsk_border_node_mesh_add_patch (mesh,
&self->border_color[1], &self->border_color[1],
bounds->size.width, 0, bounds->size.width, 0,
bounds->size.width - dst, dst * self->border_width[0] / self->border_width[1], br.x, tl.y,
bounds->size.width - dst, bounds->size.height - dst * self->border_width[2] / self->border_width[1], br.x, br.y,
bounds->size.width, bounds->size.height); bounds->size.width, bounds->size.height);
} }
@ -616,8 +626,8 @@ gsk_border_node_draw (GskRenderNode *node,
gsk_border_node_mesh_add_patch (mesh, gsk_border_node_mesh_add_patch (mesh,
&self->border_color[2], &self->border_color[2],
0, bounds->size.height, 0, bounds->size.height,
dst * self->border_width[3] / self->border_width[2], bounds->size.height - dst, tl.x, br.y,
bounds->size.width - dst * self->border_width[1] / self->border_width[2], bounds->size.height - dst, br.x, br.y,
bounds->size.width, bounds->size.height); bounds->size.width, bounds->size.height);
} }
@ -627,8 +637,8 @@ gsk_border_node_draw (GskRenderNode *node,
gsk_border_node_mesh_add_patch (mesh, gsk_border_node_mesh_add_patch (mesh,
&self->border_color[3], &self->border_color[3],
0, 0, 0, 0,
dst, dst * self->border_width[0] / self->border_width[3], tl.x, tl.y,
dst, bounds->size.height - dst * self->border_width[2] / self->border_width[3], tl.x, br.y,
0, bounds->size.height); 0, bounds->size.height);
} }