summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-03-10 15:54:34 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-03-10 15:54:21 -0500
commit1b9970658f17d6b130a24cf9a960e1a43b696160 (patch)
tree2878d5b28ff467820d130be185f0c281b10d7c71
parent53c9a06c2dd2761bfc416a5986252c2fb4c06136 (diff)
downloadefl-1b9970658f17d6b130a24cf9a960e1a43b696160.tar.gz
ecore-evas-wayland: commit on no-op configure events
this handles the case of a window configure not triggering any visible change fix T5192
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c17
1 files changed, 12 insertions, 5 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 fc1d0d4cc7..5c4b04389b 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
@@ -279,8 +279,8 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
Ecore_Evas *ee;
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl2_Event_Window_Configure *ev;
- int nw = 0, nh = 0, fw, fh;
- Eina_Bool prev_max, prev_full;
+ int nw = 0, nh = 0, fw, fh, pfw, pfh;
+ Eina_Bool prev_max, prev_full, state_change = EINA_FALSE;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -302,18 +302,25 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
nw = ev->w;
nh = ev->h;
- fw = wdata->win->geometry.w - wdata->content.w;
- fh = wdata->win->geometry.h - wdata->content.h;
+ pfw = fw = wdata->win->geometry.w - wdata->content.w;
+ pfh = fh = wdata->win->geometry.h - wdata->content.h;
if ((prev_max != ee->prop.maximized) ||
(prev_full != ee->prop.fullscreen))
{
+ state_change = EINA_TRUE;
_ecore_evas_wl_common_state_update(ee);
fw = wdata->win->geometry.w - wdata->content.w;
fh = wdata->win->geometry.h - wdata->content.h;
}
- if ((!nw) && (!nh)) return ECORE_CALLBACK_RENEW;
+ if ((!nw) && (!nh))
+ {
+ /* this assumes ecore-wl2 continues to immediately ack every configure */
+ if (wdata->win->surface && ((!state_change) || ((pfw == fw) && (pfh == fh))))
+ wl_surface_commit(wdata->win->surface);
+ return ECORE_CALLBACK_RENEW;
+ }
nw -= fw;
nh -= fh;