summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_object_main.c')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index be06e10..9b8810b 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1423,17 +1423,17 @@ _efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Ob
1423 evas_object_inform_call_changed_size_hints(eo_obj); 1423 evas_object_inform_call_changed_size_hints(eo_obj);
1424} 1424}
1425 1425
1426EOLIAN static void 1426EOLIAN static Eina_Size2D
1427_efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) 1427_efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1428{ 1428{
1429 Eina_Size2D sz = { 0, 0 };
1430
1429 if ((!obj->size_hints) || obj->delete_me) 1431 if ((!obj->size_hints) || obj->delete_me)
1430 { 1432 return sz;
1431 if (w) *w = 0; 1433
1432 if (h) *h = 0; 1434 sz.w = MAX(obj->size_hints->min.w, obj->size_hints->user_min.w);
1433 return; 1435 sz.h = MAX(obj->size_hints->min.h, obj->size_hints->user_min.h);
1434 } 1436 return sz;
1435 if (w) *w = MAX(obj->size_hints->min.w, obj->size_hints->user_min.w);
1436 if (h) *h = MAX(obj->size_hints->min.h, obj->size_hints->user_min.h);
1437} 1437}
1438 1438
1439EOLIAN static Eina_Size2D 1439EOLIAN static Eina_Size2D