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

scroll-actor: Implement pick()

Browse Source 
We need to clip the children during picking as well as we do when
painting, to avoid reactive children outside of the visible area
receiving events.

This also allows us to refactor some common code into proper functions.
This commit is contained in:
Emmanuele Bassi 2012-05-14 10:33:13 +01:00
parent ee72d9b4af
commit 39a4929d75
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clutter/clutter-scroll-actor.c
View File

@ -113,8 +113,8 @@ clutter_scroll_actor_apply_transform (ClutterActor *actor,
cogl_matrix_translate (transform, x_factor, y_factor, 0.0f); cogl_matrix_translate (transform, x_factor, y_factor, 0.0f);
} }
static void static inline void
clutter_scroll_actor_paint (ClutterActor *actor) clutter_scroll_actor_push_clip (ClutterActor *actor)
{ {
ClutterScrollActorPrivate *priv = CLUTTER_SCROLL_ACTOR (actor)->priv; ClutterScrollActorPrivate *priv = CLUTTER_SCROLL_ACTOR (actor)->priv;
ClutterActorBox allocation; ClutterActorBox allocation;
@ -139,12 +139,44 @@ clutter_scroll_actor_paint (ClutterActor *actor)
y, y,
x + width, x + width,
y + height); y + height);
}
static void
clutter_scroll_actor_paint (ClutterActor *actor)
{
clutter_scroll_actor_push_clip (actor);
CLUTTER_ACTOR_CLASS (clutter_scroll_actor_parent_class)->paint (actor); CLUTTER_ACTOR_CLASS (clutter_scroll_actor_parent_class)->paint (actor);
cogl_clip_pop (); cogl_clip_pop ();
} }
static void
clutter_scroll_actor_pick (ClutterActor *actor,
const ClutterColor *pick_color)
{
clutter_scroll_actor_push_clip (actor);
CLUTTER_ACTOR_CLASS (clutter_scroll_actor_parent_class)->pick (actor, pick_color);
cogl_clip_pop ();
}
static void
clutter_scroll_actor_set_scroll_to_internal (ClutterScrollActor *self,
const ClutterPoint *point)
{
ClutterScrollActorPrivate *priv = self->priv;
ClutterActor *actor = CLUTTER_ACTOR (self);
if (point == NULL)
clutter_point_init (&priv->scroll_to, 0.f, 0.f);
else
priv->scroll_to = *point;
clutter_actor_queue_redraw (actor);
}
static void static void
clutter_scroll_actor_set_property (GObject *gobject, clutter_scroll_actor_set_property (GObject *gobject,
guint prop_id, guint prop_id,
@ -196,6 +228,7 @@ clutter_scroll_actor_class_init (ClutterScrollActorClass *klass)
actor_class->apply_transform = clutter_scroll_actor_apply_transform; actor_class->apply_transform = clutter_scroll_actor_apply_transform;
actor_class->paint = clutter_scroll_actor_paint; actor_class->paint = clutter_scroll_actor_paint;
actor_class->pick = clutter_scroll_actor_pick;
/** /**
* ClutterScrollActor:scroll-mode: * ClutterScrollActor:scroll-mode:
@ -245,12 +278,7 @@ clutter_scroll_actor_set_final_state (ClutterAnimatable *animatable,
ClutterScrollActor *self = CLUTTER_SCROLL_ACTOR (animatable); ClutterScrollActor *self = CLUTTER_SCROLL_ACTOR (animatable);
const ClutterPoint *point = g_value_get_boxed (value); const ClutterPoint *point = g_value_get_boxed (value);
if (point == NULL) clutter_scroll_actor_set_scroll_to_internal (self, point);
clutter_point_init (&self->priv->scroll_to, 0.f, 0.f);
else
self->priv->scroll_to = *point;
clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
} }
else else
parent_animatable_iface->set_final_state (animatable, property_name, value); parent_animatable_iface->set_final_state (animatable, property_name, value);
@ -404,9 +432,7 @@ clutter_scroll_actor_scroll_to_point (ClutterScrollActor *actor,
priv->transition = NULL; priv->transition = NULL;
} }
priv->scroll_to = *point; clutter_scroll_actor_set_scroll_to_internal (actor, point);
clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
return; return;
} }