brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rectangle: Fix the border drawing conditions

Browse Source 
And reorganize the code a bit while we're at it.
This commit is contained in:
Emmanuele Bassi 2015-03-15 15:10:31 +00:00
parent 239280f855
commit ce2d86515a
1 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
clutter/deprecated/clutter-rectangle.c
View File

@ -92,55 +92,76 @@ clutter_rectangle_paint (ClutterActor *self)
: "unknown"); : "unknown");
clutter_actor_get_allocation_geometry (self, &geom); clutter_actor_get_allocation_geometry (self, &geom);
/* We paint the border if the rectangle is big enough to show it */ if (priv->has_border)
if (priv->has_border &&
priv->border_width < geom.width &&
priv->border_width < geom.height)
{ {
/* compute the composited opacity of the actor taking into /* We paint the border and the content only if the rectangle
* account the opacity of the color set by the user * is big enough to show them
*/ */
tmp_alpha = clutter_actor_get_paint_opacity (self) if ((priv->border_width * 2) < geom.width &&
* priv->border_color.alpha (priv->border_width * 2) < geom.height)
/ 255; {
/* compute the composited opacity of the actor taking into
* account the opacity of the color set by the user
*/
tmp_alpha = clutter_actor_get_paint_opacity (self)
* priv->border_color.alpha
/ 255;
/* paint the border */ /* paint the border */
cogl_set_source_color4ub (priv->border_color.red, cogl_set_source_color4ub (priv->border_color.red,
priv->border_color.green, priv->border_color.green,
priv->border_color.blue, priv->border_color.blue,
tmp_alpha); tmp_alpha);
/* this sucks, but it's the only way to make a border */ /* this sucks, but it's the only way to make a border */
cogl_rectangle (priv->border_width, 0, cogl_rectangle (priv->border_width, 0,
geom.width, geom.width,
priv->border_width); priv->border_width);
cogl_rectangle (geom.width - priv->border_width, cogl_rectangle (geom.width - priv->border_width,
priv->border_width, priv->border_width,
geom.width, geom.width,
geom.height); geom.height);
cogl_rectangle (0, geom.height - priv->border_width, cogl_rectangle (0, geom.height - priv->border_width,
geom.width - priv->border_width, geom.width - priv->border_width,
geom.height); geom.height);
cogl_rectangle (0, 0, cogl_rectangle (0, 0,
priv->border_width, priv->border_width,
geom.height - priv->border_width); geom.height - priv->border_width);
tmp_alpha = clutter_actor_get_paint_opacity (self) tmp_alpha = clutter_actor_get_paint_opacity (self)
* priv->color.alpha * priv->color.alpha
/ 255; / 255;
/* now paint the rectangle */ /* now paint the rectangle */
cogl_set_source_color4ub (priv->color.red, cogl_set_source_color4ub (priv->color.red,
priv->color.green, priv->color.green,
priv->color.blue, priv->color.blue,
tmp_alpha); tmp_alpha);
cogl_rectangle (priv->border_width, priv->border_width, cogl_rectangle (priv->border_width, priv->border_width,
geom.width - priv->border_width, geom.width - priv->border_width,
geom.height - priv->border_width); geom.height - priv->border_width);
}
else
{
/* Otherwise, we draw a rectangle with the same color
* as the border, since we can only fit that into the
* allocation.
*/
tmp_alpha = clutter_actor_get_paint_opacity (self)
* priv->border_color.alpha
/ 255;
cogl_set_source_color4ub (priv->border_color.red,
priv->border_color.green,
priv->border_color.blue,
tmp_alpha);
cogl_rectangle (0, 0, geom.width, geom.height);
}
} }
else else
{ {
@ -151,24 +172,10 @@ clutter_rectangle_paint (ClutterActor *self)
* priv->color.alpha * priv->color.alpha
/ 255; / 255;
if (priv->border_width < geom.width && cogl_set_source_color4ub (priv->color.red,
priv->border_width < geom.height) priv->color.green,
{ priv->color.blue,
cogl_set_source_color4ub (priv->color.red, tmp_alpha);
priv->color.green,
priv->color.blue,
tmp_alpha);
}
else
{
/* If the rectangle is as big as the border, we
* use the border color to draw
*/
cogl_set_source_color4ub (priv->border_color.red,
priv->border_color.green,
priv->border_color.blue,
tmp_alpha);
}
cogl_rectangle (0, 0, geom.width, geom.height); cogl_rectangle (0, 0, geom.width, geom.height);
} }