summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wl2
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/lib/ecore_wl2
parent70c118fab67375b9c14a8a51521dfaca72c1d215 (diff)
wayland: fix min/max size setting
also don't set arbitrary hints on init @fix
Diffstat (limited to 'src/lib/ecore_wl2')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 1055d7a88b..3569db9f39 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -170,6 +170,8 @@ struct _Ecore_Wl2_Window
170 uint32_t configure_serial; 170 uint32_t configure_serial;
171 void (*configure_ack)(struct xdg_surface *surface, uint32_t serial); 171 void (*configure_ack)(struct xdg_surface *surface, uint32_t serial);
172 void (*zxdg_configure_ack)(struct zxdg_surface_v6 *surface, uint32_t serial); 172 void (*zxdg_configure_ack)(struct zxdg_surface_v6 *surface, uint32_t serial);
173 void (*zxdg_set_min_size)(struct zxdg_toplevel_v6 *toplevel, int32_t w, int32_t h);
174 void (*zxdg_set_max_size)(struct zxdg_toplevel_v6 *toplevel, int32_t w, int32_t h);
173 175
174 Eina_Rectangle saved; 176 Eina_Rectangle saved;
175 Eina_Rectangle geometry; 177 Eina_Rectangle geometry;
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index ba7f4e75d6..78f6129af0 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -459,8 +459,8 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window)
459 if (window->class) 459 if (window->class)
460 zxdg_toplevel_v6_set_app_id(window->zxdg_toplevel, window->class); 460 zxdg_toplevel_v6_set_app_id(window->zxdg_toplevel, window->class);
461 461
462 zxdg_toplevel_v6_set_min_size(window->zxdg_toplevel, 1, 1); 462 window->zxdg_set_min_size = zxdg_toplevel_v6_set_min_size;
463 zxdg_toplevel_v6_set_max_size(window->zxdg_toplevel, 32767, 32767); 463 window->zxdg_set_max_size = zxdg_toplevel_v6_set_max_size;
464 464
465 window->zxdg_configure_ack = zxdg_surface_v6_ack_configure; 465 window->zxdg_configure_ack = zxdg_surface_v6_ack_configure;
466 _ecore_wl2_window_type_set(window); 466 _ecore_wl2_window_type_set(window);