aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Foreman <derek.foreman.samsung@gmail.com>2018-08-08 14:58:47 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-08 14:58:47 -0400
commit7bb0c661bdb50ecbfcaae3b23f8c2e91b2c67a1d (patch)
tree25c1d2cc1afea4dd1180dc3e4a0b672c6d21267e
parentRevert "ee_wayland: Remove pointless ack_configure" (diff)
downloadefl-7bb0c661bdb50ecbfcaae3b23f8c2e91b2c67a1d.tar.gz
ee_wayland: Update configured state on short-circuit ack-configure
Summary: When we BAIL from the configure callback with an immediate ack we don't properly update state, commit the ack, or allow ecore_wl2 to process a deferred ack_configure that happened during async rendering. Using a commit here instead should update internal state properly. ref https://phab.enlightenment.org/T7243 Depends on https://phab.enlightenment.org/D6783 Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers, zmike Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7243 Differential Revision: https://phab.enlightenment.org/D6784
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 6aa098e37f..9172593771 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -628,13 +628,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
wdata->win->req_config.serial && wdata->win->surface &&
((!state_change) || ((pfw == fw) && (pfh == fh))))
{
- if (wdata->win->xdg_configure_ack)
- wdata->win->xdg_configure_ack(wdata->win->xdg_surface,
- wdata->win->req_config.serial);
- if (wdata->win->zxdg_configure_ack)
- wdata->win->zxdg_configure_ack(wdata->win->zxdg_surface,
- wdata->win->req_config.serial);
- wdata->win->set_config.serial = wdata->win->req_config.serial;
+ ecore_wl2_window_commit(wdata->win, EINA_TRUE);
}
return ECORE_CALLBACK_RENEW;
}