summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:34:10 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:27:43 -0400
commit466456b4f02f7e36eaeec48be3404a5c87ea0ecd (patch)
treee34856252689cbb1e5472fe70ce7fc8020db5ef4 /src/lib/ecore_evas
parent50381e7911bf4a4b06d42f4b762152615a8123af (diff)
ecore-evas: init cursors for all pointer-ish objects
all of these will use a cursor visual if one is set @fix
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 18d544abbf..a752ee864f 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -360,8 +360,12 @@ static void
360_ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event) 360_ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
361{ 361{
362 Ecore_Evas *ee = data; 362 Ecore_Evas *ee = data;
363 Efl_Input_Device_Class c = efl_input_device_type_get(event->info);
363 364
364 if (efl_input_device_type_get(event->info) != EFL_INPUT_DEVICE_CLASS_MOUSE) 365 if ((c != EFL_INPUT_DEVICE_CLASS_MOUSE) &&
366 (c != EFL_INPUT_DEVICE_CLASS_PEN) &&
367 (c != EFL_INPUT_DEVICE_CLASS_TOUCH) &&
368 (c != EFL_INPUT_DEVICE_CLASS_WAND))
365 return; 369 return;
366 370
367 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED) 371 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED)
@@ -387,7 +391,11 @@ _ecore_evas_cursors_init(Ecore_Evas *ee)
387 391
388 EINA_LIST_FOREACH(devs, l, dev) 392 EINA_LIST_FOREACH(devs, l, dev)
389 { 393 {
390 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_MOUSE) 394 Efl_Input_Device_Class c = efl_input_device_type_get(dev);
395 if ((c != EFL_INPUT_DEVICE_CLASS_MOUSE) &&
396 (c != EFL_INPUT_DEVICE_CLASS_PEN) &&
397 (c != EFL_INPUT_DEVICE_CLASS_TOUCH) &&
398 (c != EFL_INPUT_DEVICE_CLASS_WAND))
391 continue; 399 continue;
392 _ecore_evas_cursor_add(ee, dev); 400 _ecore_evas_cursor_add(ee, dev);
393 } 401 }