diff options
| author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2017-10-11 17:02:52 -0300 |
|---|---|---|
| committer | SangHyeon Jade Lee <dltkdgus1764@gmail.com> | 2017-11-15 17:06:45 +0900 |
| commit | 1a616abcac0c37adf6fc8432c75debba2c308b57 (patch) | |
| tree | 39c9eb4bcf5dbc8199de81e406f46f12b25d3231 | |
| parent | 0b6039606dc5318e6ab90f2826c5cbfc44650617 (diff) | |
| download | efl-1a616abcac0c37adf6fc8432c75debba2c308b57.tar.gz | |
elm: WIP code for segarray
| -rw-r--r-- | src/lib/elementary/efl_ui_list_precise_layouter.c | 5 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_list_segarray.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_list_precise_layouter.c b/src/lib/elementary/efl_ui_list_precise_layouter.c index ec0ba81490..41a3aff3d6 100644 --- a/src/lib/elementary/efl_ui_list_precise_layouter.c +++ b/src/lib/elementary/efl_ui_list_precise_layouter.c @@ -25,7 +25,7 @@ typedef struct _Efl_Ui_List_Precise_Layouter_Size static void _efl_ui_list_precise_layouter_efl_ui_list_relayout_layout_do (Eo *obj EINA_UNUSED, Efl_Ui_List_Precise_Layouter_Data *pd - , Efl_Ui_List_Model *modeler, int first, int ccount, Eina_Accessor *items) + , Efl_Ui_List_Model *modeler, int first, int count, Eina_Accessor *items) { Efl_Ui_List_LayoutItem* layout_item; Efl_Ui_List_Precise_Layouter_Size* size; @@ -37,7 +37,6 @@ _efl_ui_list_precise_layouter_efl_ui_list_relayout_layout_do int boxl = 0, boxr = 0, boxt = 0, boxb = 0; double cur_pos = 0, scale, box_align[2], weight[2] = { 0, 0 }; Eina_Bool box_fill[2] = { EINA_FALSE, EINA_FALSE }; - int count = 0; Eina_List *order = NULL; int pad[4]; @@ -94,7 +93,7 @@ _efl_ui_list_precise_layouter_efl_ui_list_relayout_layout_do box_align[1] = 0.5; } - count = 1; + //count = 1; /* count = eina_inarray_count(&pd->items.array); */ elm_interface_scrollable_content_viewport_geometry_get diff --git a/src/lib/elementary/efl_ui_list_segarray.c b/src/lib/elementary/efl_ui_list_segarray.c index 473520a6d2..79f6994e0d 100644 --- a/src/lib/elementary/efl_ui_list_segarray.c +++ b/src/lib/elementary/efl_ui_list_segarray.c @@ -26,7 +26,7 @@ _alloc_node(Efl_Ui_List_SegArray* segarray, int first, int max) node = malloc(sizeof(Efl_Ui_List_SegArray_Node) + max*sizeof(Efl_Ui_List_Item*)); node->first = first; node->max = max; - segarray->root = eina_rbtree_insert(segarray->root, EINA_RBTREE_GET(node), &_rbtree_compare); + segarray->root = eina_rbtree_inline_insert(segarray->root, EINA_RBTREE_GET(node), &_rbtree_compare, NULL); segarray->node_count++; return node; } |