aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-07-06 10:16:21 -0400
committerChris Michael <cp.michael@samsung.com>2018-07-06 10:16:21 -0400
commit78f27a3efff24ba3b935cc9e2620718e51af9304 (patch)
tree13a69cef3687cb032c8eae6110a0a95133a804ec /src/lib/elementary/efl_ui_win.c
parentee_wayland: Remove extraneous unregister (diff)
downloadefl-78f27a3efff24ba3b935cc9e2620718e51af9304.tar.gz
ecore_wl2: Replace window ids with pointers
Summary: There's no benefit to generating ids instead of just using the Ecore_Wl2_Window pointer in events. This has the added benefit of working around a really nasty hash collision bug when multiple ecore_evas engines are used at once. ref https://phab.enlightenment.org/T7053 ref https://phab.enlightenment.org/T6222 @beta_break Depends on https://phab.enlightenment.org/D6521 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #committers, zmike Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7053, https://phab.enlightenment.org/T6222 Differential Revision: https://phab.enlightenment.org/D6522
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index c81f9a9acf..cead522d10 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4337,7 +4337,7 @@ _elm_win_wl_configure(void *data, int t EINA_UNUSED, void *event)
{
Ecore_Wl2_Event_Window_Configure *ev = event;
ELM_WIN_DATA_GET(data, sd);
- if (ecore_wl2_window_id_get(sd->wl.win) != (int)ev->win) return ECORE_CALLBACK_RENEW;
+ if (sd->wl.win != ev->win) return ECORE_CALLBACK_RENEW;
if (sd->resizing && (!ev->edges)) sd->resizing = EINA_FALSE;
return ECORE_CALLBACK_RENEW;
@@ -8413,14 +8413,14 @@ _elm_win_window_id_get(Efl_Ui_Win_Data *sd)
{
#if HAVE_ELEMENTARY_WL2
if (sd->wl.win)
- return (Ecore_Window)ecore_wl2_window_id_get(sd->wl.win);
+ return (Ecore_Window)sd->wl.win;
if (sd->parent)
{
Ecore_Wl2_Window *parent;
parent = elm_win_wl_window_get(sd->parent);
if (parent)
- return (Ecore_Window)ecore_wl2_window_id_get(parent);
+ return (Ecore_Window)parent;
}
#endif
#ifdef HAVE_ELEMENTARY_X