From 466456b4f02f7e36eaeec48be3404a5c87ea0ecd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 May 2017 16:34:10 -0400 Subject: [PATCH] ecore-evas: init cursors for all pointer-ish objects all of these will use a cursor visual if one is set @fix --- src/lib/ecore_evas/ecore_evas.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 18d544a..a752ee8 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -360,8 +360,12 @@ static void _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event) { Ecore_Evas *ee = data; + Efl_Input_Device_Class c = efl_input_device_type_get(event->info); - if (efl_input_device_type_get(event->info) != EFL_INPUT_DEVICE_CLASS_MOUSE) + if ((c != EFL_INPUT_DEVICE_CLASS_MOUSE) && + (c != EFL_INPUT_DEVICE_CLASS_PEN) && + (c != EFL_INPUT_DEVICE_CLASS_TOUCH) && + (c != EFL_INPUT_DEVICE_CLASS_WAND)) return; if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED) @@ -387,7 +391,11 @@ _ecore_evas_cursors_init(Ecore_Evas *ee) EINA_LIST_FOREACH(devs, l, dev) { - if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_MOUSE) + Efl_Input_Device_Class c = efl_input_device_type_get(dev); + if ((c != EFL_INPUT_DEVICE_CLASS_MOUSE) && + (c != EFL_INPUT_DEVICE_CLASS_PEN) && + (c != EFL_INPUT_DEVICE_CLASS_TOUCH) && + (c != EFL_INPUT_DEVICE_CLASS_WAND)) continue; _ecore_evas_cursor_add(ee, dev); } -- 2.7.4