NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary: Use separate checks for pointer object vs pointer canvas 

As under the drm engine a softcursor will be created, but not a
pointer canvas, we need to use separate if checks in certain places
like showing, hiding the mouse pointer/canvas.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2016-10-27 13:13:32 -04:00
parent 1cdeff1c42
commit 44746f24e9
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/elementary/efl_ui_win.c
View File

@ -2197,8 +2197,10 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
if (sd->pointer.obj) if (sd->pointer.obj)
{ {
evas_object_hide(sd->pointer.obj); evas_object_hide(sd->pointer.obj);
ecore_evas_hide(sd->pointer.ee);
} }
if (sd->pointer.ee) ecore_evas_hide(sd->pointer.ee);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
{ {
Eo *root; Eo *root;
@ -2672,11 +2674,8 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
#endif #endif
#ifdef HAVE_ELEMENTARY_WL2 #ifdef HAVE_ELEMENTARY_WL2
ecore_event_handler_del(sd->wl.configure_handler); ecore_event_handler_del(sd->wl.configure_handler);
if (sd->pointer.obj) if (sd->pointer.obj) evas_object_del(sd->pointer.obj);
{ if (sd->pointer.ee) ecore_evas_free(sd->pointer.ee);
evas_object_del(sd->pointer.obj);
ecore_evas_free(sd->pointer.ee);
}
#endif #endif
if (sd->img_obj) if (sd->img_obj)
@ -2756,11 +2755,9 @@ _elm_win_obj_intercept_show(void *data,
{ {
evas_object_show(sd->img_obj); evas_object_show(sd->img_obj);
} }
if (sd->pointer.obj) if (sd->pointer.obj) evas_object_show(sd->pointer.obj);
{ if (sd->pointer.ee) ecore_evas_show(sd->pointer.ee);
ecore_evas_show(sd->pointer.ee);
evas_object_show(sd->pointer.obj);
}
evas_object_show(obj); evas_object_show(obj);
#ifdef ELEMENTARY_X #ifdef ELEMENTARY_X
if (sd->type == ELM_WIN_TOOLTIP) if (sd->type == ELM_WIN_TOOLTIP)