From f36462ed8be7430f605be771743573a1980c2619 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Wed, 1 Jun 2011 22:10:12 +0900 Subject: [PATCH] navigationbar - fixed for elm_win_resize_object_add. --- src/lib/elm_navigationbar.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/lib/elm_navigationbar.c b/src/lib/elm_navigationbar.c index e265f54..7f74bbf 100644 --- a/src/lib/elm_navigationbar.c +++ b/src/lib/elm_navigationbar.c @@ -265,25 +265,16 @@ _item_del(Elm_Navigationbar_Item *it) static void _sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1; - Evas_Coord w = -1, h = -1; + Widget_Data *wd; Eina_List *list; - edje_object_size_min_calc(wd->base, &minw, &minh); - evas_object_size_hint_min_get(obj, &w, &h); - if (w > minw) minw = w; - if (h > minw) minh = h; - - evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, -1, -1); + wd = elm_widget_data_get(obj); + if (!wd) return; list = eina_list_last(wd->stack); - if (list) - { - Elm_Navigationbar_Item *it = list->data; - _item_sizing_eval(it); - } + if (!list) return; + + _item_sizing_eval(list->data); } static void @@ -607,7 +598,6 @@ elm_navigationbar_add(Evas_Object *parent) edje_object_signal_callback_add(wd->base, "elm,action,clicked", "elm", _title_clicked, obj); - //TODO: How about making the pager as a base? //TODO: Swallow title and content as one content into the pager. wd->pager = elm_pager_add(obj); -- 2.7.4