From 3686a8aa8982517acd3a761e06969cc259b00f18 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 24 Oct 2016 09:33:53 -0400 Subject: [PATCH] elementary: Don't try to set pointer edj if there is no pointer If we don't have the sd->pointer.obj here, then there is no need to try and set the edje theme for it. Signed-off-by: Chris Michael --- src/lib/elementary/efl_ui_win.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 6d750b3bdf..df7702d6e2 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -922,6 +922,7 @@ _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); @@ -935,6 +936,7 @@ _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 } @@ -3521,12 +3523,15 @@ _elm_win_frame_cb_move_start(void *data, if (sd->wl.win) ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL); - 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 (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"); + } #else (void)source; #endif @@ -3555,6 +3560,7 @@ _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 } @@ -3626,6 +3632,8 @@ _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", @@ -3678,6 +3686,7 @@ _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 }