aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-02-07 10:50:09 -0500
committerChris Michael <cp.michael@samsung.com>2017-02-07 11:10:48 -0500
commite5ed1f924397841eaad4b26e302c74039694edd7 (patch)
tree295b6e33b8f410fa44f672977494734fb3a8f866
parentecore-evas-drm: Handle creating default evas devices (diff)
downloadefl-e5ed1f924397841eaad4b26e302c74039694edd7.tar.gz
elementary: Fix return of elm_win_wl_window_get
This patch fixes an issue where the wrong wayland window would be returned from elm_win_wl_window_get. When we lookup a window in Enlightenment, this function would end up returning the parent window (if existed) when what we want there is the actual window. This patch puts the function more in line with the X11 equivalent. Fixes https://phab.enlightenment.org/T5142 @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index a9db0f480b..707f01f999 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6777,14 +6777,12 @@ elm_win_wl_window_get(const Evas_Object *obj)
return _elm_ee_wlwin_get(ee);
}
- Ecore_Wl2_Window *ret = NULL;
-
#if HAVE_ELEMENTARY_WL2
- if (sd->wl.win) ret = sd->wl.win;
- if (sd->parent) ret = elm_win_wl_window_get(sd->parent);
+ if (sd->wl.win) return sd->wl.win;
+ if (sd->parent) return elm_win_wl_window_get(sd->parent);
#endif
- return ret;
+ return NULL;
}
EAPI Ecore_Cocoa_Window *