mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 03:22:04 +00:00
* clutter/clutter-actor.c:
(_clutter_actor_apply_modelview_transform), (clutter_actor_paint): Apply clip inside paint function instead of transform function
This commit is contained in:
parent
c1e45f7ee7
commit
b961d5484c
@ -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>
|
||||
|
||||
* clutter/clutter-score.c: Update documentation.
|
||||
|
@ -1133,12 +1133,6 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
|
||||
|
||||
if (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
|
||||
@ -1209,6 +1203,12 @@ clutter_actor_paint (ClutterActor *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))
|
||||
{
|
||||
gint r, g, b;
|
||||
|
Loading…
Reference in New Issue
Block a user