St: remove hover state if reactive disabled

The hover state of a widget can become persistent if
the widget becomes reactive while a pointer grab.
To avoid that, remove hover state if the reactive property
is disabled.

https://bugzilla.gnome.org/show_bug.cgi?id=728343
This commit is contained in:
Carlos Soriano 2014-04-16 15:32:37 +02:00
parent 28c1f81f4a
commit 103027a446

View File

@ -1443,6 +1443,9 @@ st_widget_reactive_notify (StWidget *widget,
st_widget_remove_style_pseudo_class (widget, "insensitive"); st_widget_remove_style_pseudo_class (widget, "insensitive");
else else
st_widget_add_style_pseudo_class (widget, "insensitive"); st_widget_add_style_pseudo_class (widget, "insensitive");
if (widget->priv->track_hover)
st_widget_sync_hover(widget);
} }
static void static void
@ -1727,7 +1730,7 @@ st_widget_sync_hover (StWidget *widget)
device_manager = clutter_device_manager_get_default (); device_manager = clutter_device_manager_get_default ();
pointer = clutter_device_manager_get_device (device_manager, VIRTUAL_CORE_POINTER_ID); pointer = clutter_device_manager_get_device (device_manager, VIRTUAL_CORE_POINTER_ID);
pointer_actor = clutter_input_device_get_pointer_actor (pointer); pointer_actor = clutter_input_device_get_pointer_actor (pointer);
if (pointer_actor) if (pointer_actor && clutter_actor_get_reactive (CLUTTER_ACTOR (widget)))
st_widget_set_hover (widget, clutter_actor_contains (CLUTTER_ACTOR (widget), pointer_actor)); st_widget_set_hover (widget, clutter_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
else else
st_widget_set_hover (widget, FALSE); st_widget_set_hover (widget, FALSE);