isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[St] Remove _st_actor_contains()

Browse Source 
The function has been upstreamed as clutter_actor_contains() - with
the switch to clutter-1.4 it is now available to the Shell, so it
is no longer necessary to keep a copy in-tree.

https://bugzilla.gnome.org/show_bug.cgi?id=626512
This commit is contained in:
Florian Müllner
2010-08-10 10:52:18 +02:00
parent 3fb7cce80f
commit 766b5b801c
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/st/st-widget.c
View File

@ -568,7 +568,7 @@ st_widget_enter (ClutterActor *actor,
if (priv->track_hover)
{
if (_st_actor_contains (actor, event->source))
if (clutter_actor_contains (actor, event->source))
st_widget_set_hover (ST_WIDGET (actor), TRUE);
else
{
@ -594,7 +594,7 @@ st_widget_leave (ClutterActor *actor,
if (priv->track_hover)
{
if (!_st_actor_contains (actor, event->related))
if (!clutter_actor_contains (actor, event->related))
st_widget_set_hover (ST_WIDGET (actor), FALSE);
}
@ -1589,7 +1589,10 @@ st_widget_sync_hover (StWidget *widget)
pointer = clutter_device_manager_get_core_device (device_manager,
CLUTTER_POINTER_DEVICE);
pointer_actor = clutter_input_device_get_pointer_actor (pointer);
st_widget_set_hover (widget, _st_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
if (pointer_actor)
st_widget_set_hover (widget, clutter_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
else
st_widget_set_hover (widget, FALSE);
}
/**