diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2018-04-12 13:33:53 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2018-04-12 15:59:39 -0500 |
| commit | 2ad9b805175979fea0ba4889efc05ba4de311e88 (patch) | |
| tree | 37e0f00dd27e6b82791722c2ef82c7b7855d1b37 | |
| parent | b8e58eb4b22e19ffd31046b30ead7979174b26dc (diff) | |
| download | efl-2ad9b805175979fea0ba4889efc05ba4de311e88.tar.gz | |
efl_ui_win: Always show the wayland pointer
It's hidden by the compositor as required, so this just makes life much
more complicated in other code.
ref T6834
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 118d075dcf..db4f97cdb5 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -996,7 +996,6 @@ _elm_win_mouse_in(Ecore_Evas *ee) sd->pointer.surf = ecore_wl2_window_surface_get(sd->pointer.win); _elm_win_wl_cursor_set(sd->obj, NULL); //ELM_WIN_DATA_ALIVE_CHECK(obj, sd); - ecore_evas_show(sd->pointer.ee); } #endif } @@ -2359,13 +2358,6 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd) evas_object_hide(sd->pointer.obj); } -#ifdef HAVE_ELEMENTARY_WL2 - if (sd->pointer.ee) - { - ecore_evas_hide(sd->pointer.ee); - } -#endif - if (_elm_config->atspi_mode) { Eo *root; @@ -5397,6 +5389,8 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U sd->pointer.win = ecore_evas_wayland2_window_get(sd->pointer.ee); ecore_wl2_window_type_set(sd->pointer.win, ECORE_WL2_WINDOW_TYPE_NONE); + _elm_win_wl_cursor_set(sd->obj, NULL); + ecore_evas_show(sd->pointer.ee); } } #endif |