isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-26 03:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/clutter-actor.c:

Browse Source 
(_clutter_actor_apply_modelview_transform), (clutter_actor_paint):
        Apply clip inside paint function instead of transform function
This commit is contained in:
Chris Lord 2008-03-19 11:38:53 +00:00
parent c1e45f7ee7
commit b961d5484c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-19 Chris Lord <chris@openedhand.com>
* clutter/clutter-actor.c:
(_clutter_actor_apply_modelview_transform), (clutter_actor_paint):
Apply clip inside paint function instead of transform function
2008-03-18 Emmanuele Bassi <ebassi@openedhand.com> 2008-03-18 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-score.c: Update documentation. * clutter/clutter-score.c: Update documentation.

12
clutter/clutter-actor.c
View File

@ -1133,12 +1133,6 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
if (priv->z) if (priv->z)
cogl_translatex (0, 0, priv->z); cogl_translatex (0, 0, priv->z);
if (priv->has_clip)
cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]),
CLUTTER_UNITS_TO_FIXED (priv->clip[1]),
CLUTTER_UNITS_TO_FIXED (priv->clip[2]),
CLUTTER_UNITS_TO_FIXED (priv->clip[3]));
} }
/* Recursively applies the transforms associated with this actor and /* Recursively applies the transforms associated with this actor and
@ -1209,6 +1203,12 @@ clutter_actor_paint (ClutterActor *self)
_clutter_actor_apply_modelview_transform (self); _clutter_actor_apply_modelview_transform (self);
if (priv->has_clip)
cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]),
CLUTTER_UNITS_TO_FIXED (priv->clip[1]),
CLUTTER_UNITS_TO_FIXED (priv->clip[2]),
CLUTTER_UNITS_TO_FIXED (priv->clip[3]));
if (G_UNLIKELY(context->pick_mode != CLUTTER_PICK_NONE)) if (G_UNLIKELY(context->pick_mode != CLUTTER_PICK_NONE))
{ {
gint r, g, b; gint r, g, b;