From e50b43d02fdb0b608f2c99014357c95a1a746c43 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 17 Apr 2018 11:12:27 -0500 Subject: [PATCH] ecore_wl2: handle configure_complete after handling configure since configure_complete may result in a draw op, configure should be handled first so the size is correct. --- src/lib/ecore_wl2/ecore_wl2_window.c | 4 +++- src/lib/ecore_wl2/window_v6.x | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 031287500a..0e1cddb8bf 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -205,13 +205,15 @@ _xdg_surface_cb_configure(void *data, struct xdg_surface *xdg_surface EINA_UNUSE { window->saved.w = window->set_config.geometry.w; window->saved.h = window->set_config.geometry.h; - _configure_complete(window); } if (window->pending.configure && window->updating) ERR("Window shouldn't be rendering before initial configure"); if (!window->updating) _ecore_wl2_window_configure_send(window); + + if (window->pending.configure) + _configure_complete(window); } static const struct xdg_surface_listener _xdg_surface_listener = diff --git a/src/lib/ecore_wl2/window_v6.x b/src/lib/ecore_wl2/window_v6.x index 4d8ece5ae6..333586a2ac 100644 --- a/src/lib/ecore_wl2/window_v6.x +++ b/src/lib/ecore_wl2/window_v6.x @@ -11,13 +11,15 @@ _zxdg_surface_cb_configure(void *data, struct zxdg_surface_v6 *zxdg_surface EINA { window->saved.w = window->set_config.geometry.w; window->saved.h = window->set_config.geometry.h; - _configure_complete(window); } if (window->pending.configure && window->updating) ERR("Window shouldn't be rendering before initial configure"); if (!window->updating) _ecore_wl2_window_configure_send(window); + + if (window->pending.configure) + _configure_complete(window); } static const struct zxdg_surface_v6_listener _zxdg_surface_listener =