sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter: Update device for the current tool in backends

Browse source 
This should happen deeper in backends, not here in clutter-main.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho 2020-10-23 23:51:42 +02:00 committed by Marge Bot
parent 89a140d618
commit c601a824e9
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clutter/clutter/clutter-main.c
View file

@ -1912,9 +1912,6 @@ _clutter_process_event_details (ClutterActor *stage,
case CLUTTER_PROXIMITY_IN:
case CLUTTER_PROXIMITY_OUT:
clutter_input_device_update_from_tool (clutter_event_get_source_device (event),
clutter_event_get_device_tool (event));
if (_clutter_event_process_filters (event))
break;

3
src/backends/native/meta-seat-impl.c
View file

@ -1656,6 +1656,9 @@ input_device_update_tool (ClutterInputDevice *input_device,
if (evdev_device->last_tool != tool)
{
if (tool)
clutter_input_device_update_from_tool (input_device, tool);
evdev_device->last_tool = tool;
g_signal_emit_by_name (seat_impl->seat_native, "tool-changed",
input_device, tool);

3
src/backends/x11/meta-seat-x11.c
View file

@ -960,6 +960,9 @@ translate_property_event (MetaSeatX11 *seat_x11,
meta_input_device_x11_update_tool (device, tool);
g_signal_emit_by_name (seat_x11, "tool-changed", device, tool);
if (tool)
clutter_input_device_update_from_tool (device, tool);
}
}