summaryrefslogtreecommitdiff
path: root/src/modules/ecore_evas
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-04 16:11:00 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-04 16:10:42 -0400
commitf03028d22f341e9ae3745f079fb467b009993037 (patch)
tree7a21bfe9f375d4fca04ed4f89efaea5088be6b43 /src/modules/ecore_evas
parent70c118fab67375b9c14a8a51521dfaca72c1d215 (diff)
wayland: fix min/max size setting
also don't set arbitrary hints on init @fix
Diffstat (limited to 'src/modules/ecore_evas')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c11
1 files changed, 9 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 df0a6ba..0bf78dd 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
@@ -1434,27 +1434,34 @@ _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *
1434static void 1434static void
1435_ecore_evas_wl_common_size_min_set(Ecore_Evas *ee, int w, int h) 1435_ecore_evas_wl_common_size_min_set(Ecore_Evas *ee, int w, int h)
1436{ 1436{
1437 Ecore_Evas_Engine_Wl_Data *wdata;
1437 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1438 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1438 1439
1439 if (!ee) return; 1440 if (!ee) return;
1441
1440 if (w < 0) w = 0; 1442 if (w < 0) w = 0;
1441 if (h < 0) h = 0; 1443 if (h < 0) h = 0;
1442 if ((ee->prop.min.w == w) && (ee->prop.min.h == h)) return; 1444 if ((ee->prop.min.w == w) && (ee->prop.min.h == h)) return;
1443 ee->prop.min.w = w; 1445 ee->prop.min.w = w;
1444 ee->prop.min.h = h; 1446 ee->prop.min.h = h;
1447 wdata = ee->engine.data;
1448 if (wdata->win->zxdg_set_min_size && wdata->win->zxdg_toplevel)
1449 wdata->win->zxdg_set_min_size(wdata->win->zxdg_toplevel, w, h);
1445} 1450}
1446 1451
1447static void 1452static void
1448_ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h) 1453_ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
1449{ 1454{
1455 Ecore_Evas_Engine_Wl_Data *wdata;
1450 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1456 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1451 1457
1452 if (!ee) return; 1458 if (!ee) return;
1453 if (w < 0) w = 0;
1454 if (h < 0) h = 0;
1455 if ((ee->prop.max.w == w) && (ee->prop.max.h == h)) return; 1459 if ((ee->prop.max.w == w) && (ee->prop.max.h == h)) return;
1456 ee->prop.max.w = w; 1460 ee->prop.max.w = w;
1457 ee->prop.max.h = h; 1461 ee->prop.max.h = h;
1462 wdata = ee->engine.data;
1463 if (wdata->win->zxdg_set_max_size && wdata->win->zxdg_toplevel)
1464 wdata->win->zxdg_set_max_size(wdata->win->zxdg_toplevel, w, h);
1458} 1465}
1459 1466
1460static void 1467static void