diff options
author | Larry Jr <larry.olj@gmail.com> | 2017-11-06 14:38:05 -0200 |
---|---|---|
committer | Larry Jr <larry.olj@gmail.com> | 2017-11-06 14:38:05 -0200 |
commit | df395de9ec1732fc541903906d85785ac7eef284 (patch) | |
tree | 794a8b7430148fbdaa2eaaea3ac14295e762cbf5 | |
parent | 5b5ffc1193b3222a5664ca55496eeff87ea912c2 (diff) | |
download | efl-df395de9ec1732fc541903906d85785ac7eef284.tar.gz |
elm: calc size job add fix
-rw-r--r-- | src/lib/elementary/efl_ui_list_precise_layouter.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_list_precise_layouter.c b/src/lib/elementary/efl_ui_list_precise_layouter.c index 67a21c874c..5ae1e1731a 100644 --- a/src/lib/elementary/efl_ui_list_precise_layouter.c +++ b/src/lib/elementary/efl_ui_list_precise_layouter.c @@ -133,7 +133,6 @@ _count_error(void * data, Efl_Event const* event EINA_UNUSED) EINA_SAFETY_ON_NULL_RETURN(pd); pd->count_future = NULL; } - static void _on_item_size_hint_change(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -143,7 +142,6 @@ _on_item_size_hint_change(void *data, Evas *e EINA_UNUSED, _item_min_calc(cb_data->pd, obj, cb_data->size, min); } - static void _on_modeler_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -215,7 +213,7 @@ _calc_size_job(void *data) DBG("node first %d", items_node->first); for(i = 0; i != items_node->length; ++i) { - layout_item = items_node->pointers[i]; + layout_item = (Efl_Ui_List_LayoutItem *)items_node->pointers[i]; DBG("layout_do first %d count %d", pd->first, pd->count); /* EINA_SAFETY_ON_NULL_RETURN(items); */ @@ -250,16 +248,16 @@ _calc_size_job(void *data) cb_data->pd = pd; cb_data->size = size; evas_object_event_callback_add(layout_item->layout, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_item_size_hint_change, cb_data); - if ( (ecore_time_get() - start_time ) > 0.01 ) - { - DBG(" <><><> RECALC JOB SPLIT <><><> "); - ecore_job_del(pd->calc_job); - pd->calc_job = ecore_job_add(_calc_size_job, obj); - _efl_ui_list_relayout_layout_do(pd); - return; - } } } + if ( (ecore_time_get() - start_time ) > 0.01 ) + { + DBG(" <><><> RECALC JOB SPLIT <><><> "); + ecore_job_del(pd->calc_job); + pd->calc_job = ecore_job_add(_calc_size_job, obj); + _efl_ui_list_relayout_layout_do(pd); + return; + } } pd->calc_progress = 0; pd->recalc = EINA_FALSE; @@ -402,7 +400,7 @@ _efl_ui_list_relayout_layout_do(Efl_Ui_List_Precise_Layouter_Data *pd) { for(j = 0; j != items_node->length;++j) { - layout_item = items_node->pointers[j]; + layout_item = (Efl_Ui_List_LayoutItem *)items_node->pointers[j]; double cx, cy, cw, ch, x, y, w, h; double align[2]; int item_pad[4]; |