summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-19 13:26:59 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:40 -0700
commit5697f6e94b69ab1b5dd0e7b2f62b550fa226d56d (patch)
tree1eaf97d0f46d36b47feafbe98901e591c3cb9ccb /src/lib/edje
parent6073833b903f321dca982c6d79934f9d4df6ebe4 (diff)
Efl.Gfx.Image* (From Efl.Image*)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c4
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_load.c28
3 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index a64a048d60..40bdbd54f3 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3090,7 +3090,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3090 } 3090 }
3091 3091
3092 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill); 3092 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill);
3093 efl_image_smooth_scale_set(ep->object, p3->smooth); 3093 efl_gfx_image_smooth_scale_set(ep->object, p3->smooth);
3094 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible); 3094 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible);
3095 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip); 3095 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip);
3096} 3096}
@@ -3130,7 +3130,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3130 } 3130 }
3131 3131
3132 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill); 3132 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill);
3133 efl_image_smooth_scale_set(ep->object, p3->smooth); 3133 efl_gfx_image_smooth_scale_set(ep->object, p3->smooth);
3134 if (chosen_desc->image.border.scale) 3134 if (chosen_desc->image.border.scale)
3135 { 3135 {
3136 if (p3->type.common->spec.image.border_scale_by > FROM_DOUBLE(0.0)) 3136 if (p3->type.common->spec.image.border_scale_by > FROM_DOUBLE(0.0))
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index c31f3cb028..3549eee059 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -5,10 +5,10 @@
5EAPI Edje_Load_Error 5EAPI Edje_Load_Error
6edje_object_load_error_get(const Eo *obj) 6edje_object_load_error_get(const Eo *obj)
7{ 7{
8 Efl_Image_Load_Error p = efl_file_load_error_get(obj); 8 Efl_Gfx_Image_Load_Error p = efl_file_load_error_get(obj);
9 Edje *ed; 9 Edje *ed;
10 10
11 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return EDJE_LOAD_ERROR_DOES_NOT_EXIST; 11 if (p != EFL_GFX_IMAGE_LOAD_ERROR_NONE) return EDJE_LOAD_ERROR_DOES_NOT_EXIST;
12 12
13 ed = _edje_fetch(obj); 13 ed = _edje_fetch(obj);
14 if (!ed) return EDJE_LOAD_ERROR_GENERIC; 14 if (!ed) return EDJE_LOAD_ERROR_GENERIC;
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 230c556af2..c0d0ac25a3 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -166,25 +166,25 @@ _efl_canvas_layout_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char *
166 if (group) *group = ed->group; 166 if (group) *group = ed->group;
167} 167}
168 168
169EOLIAN Efl_Image_Load_Error 169EOLIAN Efl_Gfx_Image_Load_Error
170_efl_canvas_layout_efl_file_load_error_get(const Eo *obj, Edje *ed) 170_efl_canvas_layout_efl_file_load_error_get(const Eo *obj, Edje *ed)
171{ 171{
172 Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS)); 172 Efl_Gfx_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS));
173 173
174 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p; 174 if (p != EFL_GFX_IMAGE_LOAD_ERROR_NONE) return p;
175 switch (ed->load_error) 175 switch (ed->load_error)
176 { 176 {
177 case EDJE_LOAD_ERROR_NONE: return EFL_IMAGE_LOAD_ERROR_NONE; 177 case EDJE_LOAD_ERROR_NONE: return EFL_GFX_IMAGE_LOAD_ERROR_NONE;
178 case EDJE_LOAD_ERROR_GENERIC: return EFL_IMAGE_LOAD_ERROR_GENERIC; 178 case EDJE_LOAD_ERROR_GENERIC: return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
179 case EDJE_LOAD_ERROR_DOES_NOT_EXIST: return EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; 179 case EDJE_LOAD_ERROR_DOES_NOT_EXIST: return EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
180 case EDJE_LOAD_ERROR_PERMISSION_DENIED: return EFL_IMAGE_LOAD_ERROR_PERMISSION_DENIED; 180 case EDJE_LOAD_ERROR_PERMISSION_DENIED: return EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
181 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: return EFL_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; 181 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: return EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
182 case EDJE_LOAD_ERROR_CORRUPT_FILE: return EFL_IMAGE_LOAD_ERROR_CORRUPT_FILE; 182 case EDJE_LOAD_ERROR_CORRUPT_FILE: return EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
183 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT: return EFL_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT; 183 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT: return EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
184 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE: return EFL_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE; 184 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE: return EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
185 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: return EFL_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION; 185 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: return EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
186 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: return EFL_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE; 186 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: return EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
187 default: return EFL_IMAGE_LOAD_ERROR_GENERIC; 187 default: return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
188 } 188 }
189} 189}
190 190