summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:09 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:10 -0500
commit6326e18b3fb2a4757f8ffa22be5d55a75da23049 (patch)
tree31d586b52638aa0d0b1c759869a8e3368c9daf5d /src/lib/edje/edje_calc.c
parent7924660d54500285d3844bfa384394c683825cd9 (diff)
efl.file: improve api a bit
Summary: the previous implementation/api had a number of issues: * "file" property contained both "file" and "key" values - also performed file loading operation * "load_error" property which was specific to image objects * no methods for controlling file loading/unloading this patch attempts the following changes: * split "file" property into "file" and "key" properties - also remove "key" from existing "mmap" property * remove "load_error" * directly return error codes from operations * add "load" and "unload" methods for directly controlling load state * add implicit file loading if file/mmap is set during construction * rewrite all efl.file implementations to move file loading into load() method * rewrite all usage of efl.file api based on these changes * add C extension functions to mimic previous behavior ref T7577 Reviewers: segfaultxavi, bu5hm4n, cedric Reviewed By: segfaultxavi Subscribers: vitor.sousa, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7577 Differential Revision: https://phab.enlightenment.org/D8018
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 1857990f42..18dd82d0cb 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3200,17 +3200,17 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
3200 3200
3201 if (new_svg < 0) 3201 if (new_svg < 0)
3202 { 3202 {
3203 efl_file_set(ep->object, ed->file->path, src_key); 3203 efl_file_simple_load(ep->object, ed->file->path, src_key);
3204 } 3204 }
3205 else 3205 else
3206 { 3206 {
3207 snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg); 3207 snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg);
3208 3208
3209 efl_file_set(ep->object, ed->file->path, src_key); 3209 efl_file_simple_load(ep->object, ed->file->path, src_key);
3210 src_root = efl_canvas_vg_object_root_node_get(ep->object); 3210 src_root = efl_canvas_vg_object_root_node_get(ep->object);
3211 efl_ref(src_root); 3211 efl_ref(src_root);
3212 3212
3213 efl_file_set(ep->object, ed->file->path, dest_key); 3213 efl_file_simple_load(ep->object, ed->file->path, dest_key);
3214 dest_root = efl_canvas_vg_object_root_node_get(ep->object); 3214 dest_root = efl_canvas_vg_object_root_node_get(ep->object);
3215 efl_ref(dest_root); 3215 efl_ref(dest_root);
3216 3216
@@ -4927,7 +4927,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4927 proxy = ed->file->image_dir->entries[pd_mesh_node->mesh_node.texture.id].entry; 4927 proxy = ed->file->image_dir->entries[pd_mesh_node->mesh_node.texture.id].entry;
4928 if (proxy) 4928 if (proxy)
4929 { 4929 {
4930 efl_file_mmap_set(texture, ed->file->f, proxy); 4930 efl_file_simple_mmap_load(texture, ed->file->f, proxy);
4931 evas_canvas3d_texture_filter_set(texture, pd_mesh_node->mesh_node.texture.filter1, pd_mesh_node->mesh_node.texture.filter2); 4931 evas_canvas3d_texture_filter_set(texture, pd_mesh_node->mesh_node.texture.filter1, pd_mesh_node->mesh_node.texture.filter2);
4932 evas_canvas3d_texture_wrap_set(texture, pd_mesh_node->mesh_node.texture.wrap1, pd_mesh_node->mesh_node.texture.wrap2); 4932 evas_canvas3d_texture_wrap_set(texture, pd_mesh_node->mesh_node.texture.wrap1, pd_mesh_node->mesh_node.texture.wrap2);
4933 } 4933 }