efl_ui_win: Always show the wayland pointer 50/182450/1
authorDerek Foreman <derekf@osg.samsung.com>
Thu, 12 Apr 2018 18:33:53 +0000 (13:33 -0500)
committerJiyoun Park <jy0703.park@samsung.com>
Mon, 25 Jun 2018 08:12:30 +0000 (17:12 +0900)
It's hidden by the compositor as required, so this just makes life much
more complicated in other code.

ref T6834

Change-Id: Ib40f9fd189edea084acdf99b18436adc5ce2f3e5

src/lib/elementary/efl_ui_win.c

index 93b7cdc..6849cd0 100644 (file)
@@ -1167,7 +1167,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
 }
@@ -2896,13 +2895,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_atspi_enabled())
      {
         Eo *root;
@@ -6537,6 +6529,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);
           }
      }
 */