From bf3ff4a5d1fa8f341f76353a550d4187793e9ec4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 13 Aug 2013 11:28:02 +0100 Subject: [PATCH] gadman checks aspect hints during size hint change callback --- src/modules/gadman/e_mod_gadman.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index bf1425f58..c1c4e07f5 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -241,8 +241,17 @@ _gadman_gadget_size_hints_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, int w, h; evas_object_geometry_get(obj, NULL, NULL, &w, &h); - w = MAX(w, gcc->min.w); - h = MAX(h, gcc->min.h); + /* size hints change for either min or aspect */ + if (gcc->min.w || gcc->min.h) + { + w = MAX(w, gcc->min.w); + h = MAX(h, gcc->min.h); + } + if (gcc->aspect.w && gcc->aspect.h) + { + w = MAX(w, gcc->aspect.w); + h = MAX(h, gcc->aspect.h); + } evas_object_resize(gcc->o_frame, w, h); _save_widget_position(gcc); }