[EGIT] [core/efl] master 02/04: Revert "elementary: Don't try to set pointer edj if there is no pointer"

[Christopher Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=13f77a2456c0a770e94e68f168a1ffda9e5298ae

commit 13f77a2456c0a770e94e68f168a1ffda9e5298ae
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Tue Oct 25 10:46:42 2016 -0400

    Revert "elementary: Don't try to set pointer edj if there is no pointer"
    
    This reverts commit 3686a8aa8982517acd3a761e06969cc259b00f18.
    
    Reverting this as we need to handle mouse pointers a different way.
---
 src/lib/elementary/efl_ui_win.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index df7702d..6d750b3 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -922,7 +922,6 @@ _elm_win_mouse_in(Ecore_Evas *ee)
    if (sd->wl.win)
      ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
 
-   if (!sd->pointer.obj) return;
    ecore_evas_object_cursor_set(sd->ee, sd->pointer.obj,
                                 ELM_OBJECT_LAYER_CURSOR,
                                 sd->pointer.hot_x, sd->pointer.hot_y);
@@ -936,7 +935,6 @@ _elm_win_mouse_out(Ecore_Evas *ee)
    if (!sd) return;
 
 #ifdef HAVE_ELEMENTARY_WL2
-   if (!sd->pointer.obj) return;
    sd->pointer.obj = ecore_evas_cursor_unset(sd->ee);
 #endif
 }
@@ -3523,15 +3521,12 @@ _elm_win_frame_cb_move_start(void *data,
    if (sd->wl.win)
      ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
 
-   if (sd->pointer.obj)
-     {
-        if (!strcmp(source, "elm"))
-          _elm_theme_object_set(sd->obj, sd->pointer.obj,
-                                "pointer", "base", "move");
-        else
-          _elm_theme_object_set(sd->obj, sd->pointer.obj,
-                                "pointer", "base", "default");
-     }
+   if (!strcmp(source, "elm"))
+     _elm_theme_object_set(sd->obj, sd->pointer.obj,
+                           "pointer", "base", "move");
+   else
+     _elm_theme_object_set(sd->obj, sd->pointer.obj,
+                           "pointer", "base", "default");
 #else
    (void)source;
 #endif
@@ -3560,7 +3555,6 @@ _elm_win_frame_cb_move_stop(void *data,
 #ifdef HAVE_ELEMENTARY_WL2
    if (sd->wl.win)
      ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
-   if (!sd->pointer.obj) return;
    _elm_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base", 
"default");
 #endif
 }
@@ -3632,8 +3626,6 @@ _elm_win_frame_cb_resize_show(void *data,
    Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;
    int i;
 
-   if (!sd->pointer.obj) return;
-
    i = sd->rot / 90;
    if (!strcmp(source, "elm.event.resize.t"))
      _elm_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base",
@@ -3686,7 +3678,6 @@ _elm_win_frame_cb_resize_hide(void *data,
    if (sd->resizing) return;
 
 #ifdef HAVE_ELEMENTARY_WL2
-   if (!sd->pointer.obj) return;
    _elm_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base", 
"default");
 #endif
 }

--