From 7a3ec89fd22f4882bd4ecb73918c1a2ff158416c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 18 Jan 2018 10:47:01 -0500 Subject: [PATCH] elm_win: move wayland display flush to after method calls ref b48781aa6c85c72f620c57cebff96580ddd67899 --- src/lib/elementary/efl_ui_win.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 42f78a1c1c..18eda6531d 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4174,16 +4174,21 @@ _elm_win_frame_cb_menu(void *data, Eina_Iterator *it; Ecore_Wl2_Display *display = ecore_wl2_window_display_get(sd->wl.win); it = ecore_wl2_display_inputs_get(display); - ecore_wl2_display_flush(input->display); EINA_ITERATOR_FOREACH(it, input) break; eina_iterator_free(it); } if (sd->wl.win->xdg_toplevel) - xdg_toplevel_show_window_menu(sd->wl.win->xdg_toplevel, + { + xdg_toplevel_show_window_menu(sd->wl.win->xdg_toplevel, ecore_wl2_input_seat_get(input), 0, x, y); + ecore_wl2_display_flush(input->display); + } else if (sd->wl.win->zxdg_toplevel) - zxdg_toplevel_v6_show_window_menu(sd->wl.win->zxdg_toplevel, + { + zxdg_toplevel_v6_show_window_menu(sd->wl.win->zxdg_toplevel, ecore_wl2_input_seat_get(input), 0, x, y); + ecore_wl2_display_flush(input->display); + } #else (void)sd; #endif