diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2013-11-28 19:24:26 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2013-11-28 19:24:26 +0900 |
| commit | 8c24b5a87b100253f4fbf759e8df9a792addf7ac (patch) | |
| tree | c05e5a760c98367e2023864ca0aaf1ad1577fdb0 | |
| parent | d777b1e21e65df140b4f38ebb328502cde013ea7 (diff) | |
| download | elementary-8c24b5a87b100253f4fbf759e8df9a792addf7ac.tar.gz | |
elm - diskselector - fix min height to at least be min height of items
diskselector needs a major rewrite effort, BUT... until that happens
this fixes minbimum height and that fixes T506
| -rw-r--r-- | src/lib/elm_diskselector.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index be5eb4421..978a0cfa3 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -292,13 +292,20 @@ _resize_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - Evas_Coord w, h; + Evas_Coord w, h, vw = 0, vh = 0, mw = 0, mh = 0; ELM_DISKSELECTOR_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if ((sd->minw == -1) && (sd->minh == -1)) elm_coords_finger_size_adjust(6, &sd->minw, 1, &sd->minh); + eo_do(obj, elm_scrollable_interface_content_viewport_size_get(&vw, &vh)); + if (sd->items) + { + Elm_Diskselector_Item *it = sd->items->data; + evas_object_size_hint_min_get(VIEW(it), &mw, &mh); + } + if (sd->minh < mh) sd->minh = mh; edje_object_size_min_restricted_calc (wd->resize_obj, &sd->minw, &sd->minh, sd->minw, sd->minh); @@ -458,14 +465,16 @@ _item_text_set_hook(Elm_Object_Item *item, const char *label) { Elm_Diskselector_Item *it; + Evas_Coord mw, mh; if (part && strcmp(part, "default")) return; it = (Elm_Diskselector_Item *)item; eina_stringshare_replace(&it->label, label); edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label); - _item_signal_emit(it); + edje_object_size_min_calc(VIEW(it), &mw, &mh); + evas_object_size_hint_min_set(VIEW(it), 0, mh); } static const char * |