summaryrefslogtreecommitdiff
path: root/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c36
1 files changed, 34 insertions, 2 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 666fc9a004..ad307edd51 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
@@ -194,6 +194,17 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
194 ee->w = w; 194 ee->w = w;
195 ee->h = h; 195 ee->h = h;
196 196
197 if (wdata->win->zxdg_set_min_size && wdata->win->zxdg_toplevel && wdata->win->pending.min)
198 {
199 wdata->win->zxdg_set_min_size(wdata->win->zxdg_toplevel, ee->prop.min.w, ee->prop.min.h);
200 wdata->win->pending.min = 0;
201 }
202 if (wdata->win->zxdg_set_max_size && wdata->win->zxdg_toplevel && wdata->win->pending.max)
203 {
204 wdata->win->zxdg_set_max_size(wdata->win->zxdg_toplevel, ee->prop.max.w, ee->prop.max.h);
205 wdata->win->pending.max = 0;
206 }
207
197 if (!ee->prop.fullscreen) 208 if (!ee->prop.fullscreen)
198 { 209 {
199 int fw = 0, fh = 0; 210 int fw = 0, fh = 0;
@@ -1451,7 +1462,12 @@ _ecore_evas_wl_common_size_min_set(Ecore_Evas *ee, int w, int h)
1451 ee->prop.min.h = h; 1462 ee->prop.min.h = h;
1452 wdata = ee->engine.data; 1463 wdata = ee->engine.data;
1453 if (wdata->win->zxdg_set_min_size && wdata->win->zxdg_toplevel) 1464 if (wdata->win->zxdg_set_min_size && wdata->win->zxdg_toplevel)
1454 wdata->win->zxdg_set_min_size(wdata->win->zxdg_toplevel, w, h); 1465 {
1466 wdata->win->zxdg_set_min_size(wdata->win->zxdg_toplevel, w, h);
1467 wdata->win->pending.min = 0;
1468 }
1469 else
1470 wdata->win->pending.min = 1;
1455 _ecore_evas_wl_common_resize(ee, ee->w, ee->h); 1471 _ecore_evas_wl_common_resize(ee, ee->w, ee->h);
1456} 1472}
1457 1473
@@ -1469,7 +1485,12 @@ _ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
1469 ee->prop.max.h = h; 1485 ee->prop.max.h = h;
1470 wdata = ee->engine.data; 1486 wdata = ee->engine.data;
1471 if (wdata->win->zxdg_set_max_size && wdata->win->zxdg_toplevel) 1487 if (wdata->win->zxdg_set_max_size && wdata->win->zxdg_toplevel)
1472 wdata->win->zxdg_set_max_size(wdata->win->zxdg_toplevel, w, h); 1488 {
1489 wdata->win->zxdg_set_max_size(wdata->win->zxdg_toplevel, w, h);
1490 wdata->win->pending.max = 0;
1491 }
1492 else
1493 wdata->win->pending.max = 1;
1473 _ecore_evas_wl_common_resize(ee, ee->w, ee->h); 1494 _ecore_evas_wl_common_resize(ee, ee->w, ee->h);
1474} 1495}
1475 1496
@@ -1977,6 +1998,17 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
1977 { 1998 {
1978 int fw, fh; 1999 int fw, fh;
1979 2000
2001 if (wdata->win->zxdg_set_min_size && wdata->win->zxdg_toplevel && wdata->win->pending.min)
2002 {
2003 wdata->win->zxdg_set_min_size(wdata->win->zxdg_toplevel, ee->prop.min.w, ee->prop.min.h);
2004 wdata->win->pending.min = 0;
2005 }
2006 if (wdata->win->zxdg_set_max_size && wdata->win->zxdg_toplevel && wdata->win->pending.max)
2007 {
2008 wdata->win->zxdg_set_max_size(wdata->win->zxdg_toplevel, ee->prop.max.w, ee->prop.max.h);
2009 wdata->win->pending.max = 0;
2010 }
2011
1980 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); 2012 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
1981 2013
1982 ecore_wl2_window_geometry_set(wdata->win, 0, 0, ee->w, ee->h); 2014 ecore_wl2_window_geometry_set(wdata->win, 0, 0, ee->w, ee->h);