summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi-Youn Park <jy0703.park@samsung.com>2016-05-31 19:08:21 +0830
committerJi-Youn Park <jy0703.park@samsung.com>2016-05-31 19:16:41 +0830
commita0ec05cd8f9307d0a28f6902680f579b96812f71 (patch)
treee25093bd9ce0396cce61ec3ab5a49d6804efaefb
parentb8d1db365b86c8c0a7d98fa021e377419e563b60 (diff)
elm_image: rename the elm_image into efl_ui_image.
-rw-r--r--src/Makefile_Elementary.am6
-rw-r--r--src/lib/elementary/Elementary.h.in1
-rw-r--r--src/lib/elementary/Makefile.am6
-rw-r--r--src/lib/elementary/efl_ui_image.c (renamed from src/lib/elementary/elm_image.c)474
-rw-r--r--src/lib/elementary/efl_ui_image.eo (renamed from src/lib/elementary/elm_image.eo)14
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h (renamed from src/lib/elementary/elm_widget_image.h)34
-rw-r--r--src/lib/elementary/elm_icon.c12
-rw-r--r--src/lib/elementary/elm_icon.eo2
8 files changed, 274 insertions, 275 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 550a54a36a..eee1138c59 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -39,7 +39,7 @@ elm_public_eolian_files = \
39 lib/elementary/elm_hover.eo \ 39 lib/elementary/elm_hover.eo \
40 lib/elementary/elm_hoversel.eo \ 40 lib/elementary/elm_hoversel.eo \
41 lib/elementary/elm_icon.eo \ 41 lib/elementary/elm_icon.eo \
42 lib/elementary/elm_image.eo \ 42 lib/elementary/efl_ui_image.eo \
43 lib/elementary/elm_index.eo \ 43 lib/elementary/elm_index.eo \
44 lib/elementary/elm_interface_atspi_accessible.eo \ 44 lib/elementary/elm_interface_atspi_accessible.eo \
45 lib/elementary/elm_interface_atspi_action.eo \ 45 lib/elementary/elm_interface_atspi_action.eo \
@@ -219,7 +219,7 @@ includesunstable_HEADERS = \
219 lib/elementary/elm_widget_hover.h \ 219 lib/elementary/elm_widget_hover.h \
220 lib/elementary/elm_widget_hoversel.h \ 220 lib/elementary/elm_widget_hoversel.h \
221 lib/elementary/elm_widget_icon.h \ 221 lib/elementary/elm_widget_icon.h \
222 lib/elementary/elm_widget_image.h \ 222 lib/elementary/efl_ui_widget_image.h \
223 lib/elementary/elm_widget_index.h \ 223 lib/elementary/elm_widget_index.h \
224 lib/elementary/elm_widget_inwin.h \ 224 lib/elementary/elm_widget_inwin.h \
225 lib/elementary/elm_widget_label.h \ 225 lib/elementary/elm_widget_label.h \
@@ -584,7 +584,7 @@ lib_elementary_libelementary_la_SOURCES = \
584 lib/elementary/elm_grid.c \ 584 lib/elementary/elm_grid.c \
585 lib/elementary/elm_hover.c \ 585 lib/elementary/elm_hover.c \
586 lib/elementary/elm_icon.c \ 586 lib/elementary/elm_icon.c \
587 lib/elementary/elm_image.c \ 587 lib/elementary/efl_ui_image.c \
588 lib/elementary/elm_index.c \ 588 lib/elementary/elm_index.c \
589 lib/elementary/elm_interface_atspi_accessible.c \ 589 lib/elementary/elm_interface_atspi_accessible.c \
590 lib/elementary/elm_interface_atspi_action.c \ 590 lib/elementary/elm_interface_atspi_action.c \
diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in
index b85eaffaec..1afc39d5ca 100644
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -271,6 +271,7 @@ EAPI extern Elm_Version *elm_version;
271# include <efl_ui_box.eo.h> 271# include <efl_ui_box.eo.h>
272# include <efl_ui_box_flow.eo.h> 272# include <efl_ui_box_flow.eo.h>
273# include <efl_ui_grid.eo.h> 273# include <efl_ui_grid.eo.h>
274# include <efl_ui_image.eo.h>
274#endif 275#endif
275 276
276/* include deprecated calls last of all */ 277/* include deprecated calls last of all */
diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am
index 976897b624..51ccc88c61 100644
--- a/src/lib/elementary/Makefile.am
+++ b/src/lib/elementary/Makefile.am
@@ -44,7 +44,7 @@ elm_eolian_files = \
44 elm_hover.eo \ 44 elm_hover.eo \
45 elm_hoversel.eo \ 45 elm_hoversel.eo \
46 elm_icon.eo \ 46 elm_icon.eo \
47 elm_image.eo \ 47 efl_ui_image.eo \
48 elm_index.eo \ 48 elm_index.eo \
49 elm_interface_atspi_accessible.eo \ 49 elm_interface_atspi_accessible.eo \
50 elm_interface_atspi_action.eo \ 50 elm_interface_atspi_action.eo \
@@ -191,7 +191,7 @@ includesunstable_HEADERS = \
191 elm_widget_hover.h \ 191 elm_widget_hover.h \
192 elm_widget_hoversel.h \ 192 elm_widget_hoversel.h \
193 elm_widget_icon.h \ 193 elm_widget_icon.h \
194 elm_widget_image.h \ 194 efl_ui_widget_image.h \
195 elm_widget_index.h \ 195 elm_widget_index.h \
196 elm_widget_inwin.h \ 196 elm_widget_inwin.h \
197 elm_widget_label.h \ 197 elm_widget_label.h \
@@ -553,7 +553,7 @@ libelementary_la_SOURCES = \
553 elm_grid.c \ 553 elm_grid.c \
554 elm_hover.c \ 554 elm_hover.c \
555 elm_icon.c \ 555 elm_icon.c \
556 elm_image.c \ 556 efl_ui_image.c \
557 elm_index.c \ 557 elm_index.c \
558 elm_interface_atspi_accessible.c \ 558 elm_interface_atspi_accessible.c \
559 elm_interface_atspi_action.c \ 559 elm_interface_atspi_action.c \
diff --git a/src/lib/elementary/elm_image.c b/src/lib/elementary/efl_ui_image.c
index 2da4ff1b09..a2f43aa71e 100644
--- a/src/lib/elementary/elm_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -9,12 +9,12 @@
9#include <Elementary.h> 9#include <Elementary.h>
10 10
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_widget_image.h" 12#include "efl_ui_widget_image.h"
13 13
14#define FMT_SIZE_T "%zu" 14#define FMT_SIZE_T "%zu"
15 15
16#define MY_CLASS ELM_IMAGE_CLASS 16#define MY_CLASS EFL_UI_IMAGE_CLASS
17#define MY_CLASS_NAME "Elm_Image" 17#define MY_CLASS_NAME "Efl.Ui.Image"
18#define MY_CLASS_NAME_LEGACY "elm_image" 18#define MY_CLASS_NAME_LEGACY "elm_image"
19 19
20#define NON_EXISTING (void *)-1 20#define NON_EXISTING (void *)-1
@@ -37,8 +37,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
37}; 37};
38 38
39static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); 39static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
40static Eina_Bool _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, const Eina_File *f, const char *key); 40static Eina_Bool _efl_ui_image_smart_internal_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file, const Eina_File *f, const char *key);
41static void _elm_image_sizing_eval(Eo *obj); 41static void _efl_ui_image_sizing_eval(Eo *obj);
42 42
43static const Elm_Action key_actions[] = { 43static const Elm_Action key_actions[] = {
44 {"activate", _key_action_activate}, 44 {"activate", _key_action_activate},
@@ -59,8 +59,8 @@ _on_image_preloaded(void *data,
59 Evas_Object *obj, 59 Evas_Object *obj,
60 void *event EINA_UNUSED) 60 void *event EINA_UNUSED)
61{ 61{
62 Elm_Image_Data *sd = data; 62 Efl_Ui_Image_Data *sd = data;
63 sd->preload_status = ELM_IMAGE_PRELOADED; 63 sd->preload_status = EFL_UI_IMAGE_PRELOADED;
64 if (sd->show) evas_object_show(obj); 64 if (sd->show) evas_object_show(obj);
65 ELM_SAFE_FREE(sd->prev_img, evas_object_del); 65 ELM_SAFE_FREE(sd->prev_img, evas_object_del);
66} 66}
@@ -83,9 +83,9 @@ _on_mouse_up(void *data,
83} 83}
84 84
85static Eina_Bool 85static Eina_Bool
86_elm_image_animate_cb(void *data) 86_efl_ui_image_animate_cb(void *data)
87{ 87{
88 ELM_IMAGE_DATA_GET(data, sd); 88 EFL_UI_IMAGE_DATA_GET(data, sd);
89 89
90 if (!sd->anim) return ECORE_CALLBACK_CANCEL; 90 if (!sd->anim) return ECORE_CALLBACK_CANCEL;
91 91
@@ -109,7 +109,7 @@ _img_new(Evas_Object *obj)
109{ 109{
110 Evas_Object *img; 110 Evas_Object *img;
111 111
112 ELM_IMAGE_DATA_GET(obj, sd); 112 EFL_UI_IMAGE_DATA_GET(obj, sd);
113 113
114 img = evas_object_image_add(evas_object_evas_get(obj)); 114 img = evas_object_image_add(evas_object_evas_get(obj));
115 evas_object_image_scale_hint_set(img, EVAS_IMAGE_SCALE_HINT_STATIC); 115 evas_object_image_scale_hint_set(img, EVAS_IMAGE_SCALE_HINT_STATIC);
@@ -123,7 +123,7 @@ _img_new(Evas_Object *obj)
123} 123}
124 124
125static void 125static void
126_elm_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Elm_Image_Data *sd) 126_efl_ui_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
127{ 127{
128 if (!sd->img) return; 128 if (!sd->img) return;
129 129
@@ -154,15 +154,15 @@ _elm_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Elm_Image_Data *sd
154 // according to (iw x ih), (sd->img_w x sd->img_h), and scale_type 154 // according to (iw x ih), (sd->img_w x sd->img_h), and scale_type
155 switch (sd->scale_type) 155 switch (sd->scale_type)
156 { 156 {
157 case ELM_IMAGE_SCALE_TYPE_NONE: 157 case EFL_UI_IMAGE_SCALE_TYPE_NONE:
158 w = iw; 158 w = iw;
159 h = ih; 159 h = ih;
160 break; 160 break;
161 case ELM_IMAGE_SCALE_TYPE_FILL: 161 case EFL_UI_IMAGE_SCALE_TYPE_FILL:
162 w = sd->img_w; 162 w = sd->img_w;
163 h = sd->img_h; 163 h = sd->img_h;
164 break; 164 break;
165 case ELM_IMAGE_SCALE_TYPE_FIT_INSIDE: 165 case EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE:
166 w = sd->img_w; 166 w = sd->img_w;
167 h = ((double)ih * w) / (double)iw; 167 h = ((double)ih * w) / (double)iw;
168 168
@@ -179,7 +179,7 @@ _elm_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Elm_Image_Data *sd
179 h = ih; 179 h = ih;
180 } 180 }
181 break; 181 break;
182 case ELM_IMAGE_SCALE_TYPE_FIT_OUTSIDE: 182 case EFL_UI_IMAGE_SCALE_TYPE_FIT_OUTSIDE:
183 w = sd->img_w; 183 w = sd->img_w;
184 h = ((double)ih * w) / (double)iw; 184 h = ((double)ih * w) / (double)iw;
185 if (h < sd->img_h) 185 if (h < sd->img_h)
@@ -242,7 +242,7 @@ _async_open_data_free(Async_Open_Data *data)
242} 242}
243 243
244static void 244static void
245_elm_image_async_open_do(void *data, Ecore_Thread *thread EINA_UNUSED) 245_efl_ui_image_async_open_do(void *data, Ecore_Thread *thread EINA_UNUSED)
246{ 246{
247 Evas_Object *obj = data; 247 Evas_Object *obj = data;
248 Eina_File *f; 248 Eina_File *f;
@@ -250,7 +250,7 @@ _elm_image_async_open_do(void *data, Ecore_Thread *thread EINA_UNUSED)
250 void *map = NULL; 250 void *map = NULL;
251 unsigned int buf; 251 unsigned int buf;
252 252
253 ELM_IMAGE_DATA_GET(obj, sd); 253 EFL_UI_IMAGE_DATA_GET(obj, sd);
254 254
255 eina_spinlock_take(&sd->async.lck); 255 eina_spinlock_take(&sd->async.lck);
256 todo = sd->async.todo; 256 todo = sd->async.todo;
@@ -327,10 +327,10 @@ begin:
327} 327}
328 328
329static void 329static void
330_elm_image_async_open_cancel(void *data, Ecore_Thread *thread EINA_UNUSED) 330_efl_ui_image_async_open_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
331{ 331{
332 Evas_Object *obj = data; 332 Evas_Object *obj = data;
333 ELM_IMAGE_DATA_GET(obj, sd); 333 EFL_UI_IMAGE_DATA_GET(obj, sd);
334 334
335 DBG("Async open thread was canceled"); 335 DBG("Async open thread was canceled");
336 sd->async.th = NULL; 336 sd->async.th = NULL;
@@ -340,7 +340,7 @@ _elm_image_async_open_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
340} 340}
341 341
342static void 342static void
343_elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED) 343_efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
344{ 344{
345 Evas_Object *obj = data; 345 Evas_Object *obj = data;
346 Eina_Stringshare *file, *key; 346 Eina_Stringshare *file, *key;
@@ -349,7 +349,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
349 Eina_File *f; 349 Eina_File *f;
350 void *map; 350 void *map;
351 351
352 ELM_IMAGE_DATA_GET(obj, sd); 352 EFL_UI_IMAGE_DATA_GET(obj, sd);
353 353
354 // async open thread can't be running now 354 // async open thread can't be running now
355 // locking anyways to be sure (memory barrier), see CID 1343345 355 // locking anyways to be sure (memory barrier), see CID 1343345
@@ -361,9 +361,9 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
361 if (sd->async.todo) 361 if (sd->async.todo)
362 { 362 {
363 eina_spinlock_release(&sd->async.lck); 363 eina_spinlock_release(&sd->async.lck);
364 sd->async.th = ecore_thread_run(_elm_image_async_open_do, 364 sd->async.th = ecore_thread_run(_efl_ui_image_async_open_do,
365 _elm_image_async_open_done, 365 _efl_ui_image_async_open_done,
366 _elm_image_async_open_cancel, obj); 366 _efl_ui_image_async_open_cancel, obj);
367 367
368 return; 368 return;
369 } 369 }
@@ -398,7 +398,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
398 if (sd->edje) 398 if (sd->edje)
399 ok = edje_object_mmap_set(sd->img, f, key); 399 ok = edje_object_mmap_set(sd->img, f, key);
400 else 400 else
401 ok = _elm_image_smart_internal_file_set(obj, sd, file, f, key); 401 ok = _efl_ui_image_smart_internal_file_set(obj, sd, file, f, key);
402 } 402 }
403 403
404 if (ok) 404 if (ok)
@@ -408,7 +408,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
408 ELM_SAFE_FREE(sd->async.file, eina_stringshare_del); 408 ELM_SAFE_FREE(sd->async.file, eina_stringshare_del);
409 ELM_SAFE_FREE(sd->async.key, eina_stringshare_del); 409 ELM_SAFE_FREE(sd->async.key, eina_stringshare_del);
410 eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL); 410 eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
411 _elm_image_internal_sizing_eval(obj, sd); 411 _efl_ui_image_internal_sizing_eval(obj, sd);
412 } 412 }
413 else 413 else
414 { 414 {
@@ -423,7 +423,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
423} 423}
424 424
425static Eina_Bool 425static Eina_Bool
426_elm_image_async_file_set(Eo *obj, Elm_Image_Data *sd, 426_efl_ui_image_async_file_set(Eo *obj, Efl_Ui_Image_Data *sd,
427 const char *file, const Eina_File *f, const char *key) 427 const char *file, const Eina_File *f, const char *key)
428{ 428{
429 Async_Open_Data *todo; 429 Async_Open_Data *todo;
@@ -443,9 +443,9 @@ _elm_image_async_file_set(Eo *obj, Elm_Image_Data *sd,
443 if (!sd->async.th) 443 if (!sd->async.th)
444 { 444 {
445 was_running = EINA_FALSE; 445 was_running = EINA_FALSE;
446 sd->async.th = ecore_thread_run(_elm_image_async_open_do, 446 sd->async.th = ecore_thread_run(_efl_ui_image_async_open_do,
447 _elm_image_async_open_done, 447 _efl_ui_image_async_open_done,
448 _elm_image_async_open_cancel, obj); 448 _efl_ui_image_async_open_cancel, obj);
449 } 449 }
450 else was_running = EINA_TRUE; 450 else was_running = EINA_TRUE;
451 451
@@ -483,14 +483,14 @@ _elm_image_async_file_set(Eo *obj, Elm_Image_Data *sd,
483} 483}
484 484
485static Eina_Bool 485static Eina_Bool
486_elm_image_edje_file_set(Evas_Object *obj, 486_efl_ui_image_edje_file_set(Evas_Object *obj,
487 const char *file, 487 const char *file,
488 const Eina_File *f, 488 const Eina_File *f,
489 const char *group) 489 const char *group)
490{ 490{
491 Evas_Object *pclip; 491 Evas_Object *pclip;
492 492
493 ELM_IMAGE_DATA_GET(obj, sd); 493 EFL_UI_IMAGE_DATA_GET(obj, sd);
494 494
495 ELM_SAFE_FREE(sd->prev_img, evas_object_del); 495 ELM_SAFE_FREE(sd->prev_img, evas_object_del);
496 496
@@ -529,16 +529,16 @@ _elm_image_edje_file_set(Evas_Object *obj,
529 } 529 }
530 } 530 }
531 else 531 else
532 return _elm_image_async_file_set(obj, sd, file, f, group); 532 return _efl_ui_image_async_file_set(obj, sd, file, f, group);
533 533
534 /* FIXME: do i want to update icon on file change ? */ 534 /* FIXME: do i want to update icon on file change ? */
535 _elm_image_internal_sizing_eval(obj, sd); 535 _efl_ui_image_internal_sizing_eval(obj, sd);
536 536
537 return EINA_TRUE; 537 return EINA_TRUE;
538} 538}
539 539
540EOLIAN static void 540EOLIAN static void
541_elm_image_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, Eina_Bool smooth) 541_efl_ui_image_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Bool smooth)
542{ 542{
543 if (sd->edje) return; 543 if (sd->edje) return;
544 544
@@ -546,7 +546,7 @@ _elm_image_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, E
546} 546}
547 547
548EOLIAN static Eina_Bool 548EOLIAN static Eina_Bool
549_elm_image_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 549_efl_ui_image_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
550{ 550{
551 if (sd->edje) return EINA_FALSE; 551 if (sd->edje) return EINA_FALSE;
552 552
@@ -554,7 +554,7 @@ _elm_image_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
554} 554}
555 555
556static Eina_Bool 556static Eina_Bool
557_elm_image_drag_n_drop_cb(void *elm_obj, 557_efl_ui_image_drag_n_drop_cb(void *elm_obj,
558 Evas_Object *obj, 558 Evas_Object *obj,
559 Elm_Selection_Data *drop) 559 Elm_Selection_Data *drop)
560{ 560{
@@ -565,7 +565,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
565 DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj), 565 DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj),
566 SIG_DND, (char *)drop->data); 566 SIG_DND, (char *)drop->data);
567 567
568 eo_event_callback_call(elm_obj, ELM_IMAGE_EVENT_DROP, drop->data); 568 eo_event_callback_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
569 return EINA_TRUE; 569 return EINA_TRUE;
570 } 570 }
571 571
@@ -573,7 +573,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
573} 573}
574 574
575EOLIAN static void 575EOLIAN static void
576_elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv) 576_efl_ui_image_evas_object_smart_add(Eo *obj, Efl_Ui_Image_Data *priv)
577{ 577{
578 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 578 evas_obj_smart_add(eo_super(obj, MY_CLASS));
579 elm_widget_sub_object_parent_add(obj); 579 elm_widget_sub_object_parent_add(obj);
@@ -608,11 +608,11 @@ _elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
608 608
609 elm_widget_can_focus_set(obj, EINA_FALSE); 609 elm_widget_can_focus_set(obj, EINA_FALSE);
610 610
611 _elm_image_sizing_eval(obj); 611 _efl_ui_image_sizing_eval(obj);
612} 612}
613 613
614EOLIAN static void 614EOLIAN static void
615_elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd) 615_efl_ui_image_evas_object_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
616{ 616{
617 ecore_timer_del(sd->anim_timer); 617 ecore_timer_del(sd->anim_timer);
618 evas_object_del(sd->img); 618 evas_object_del(sd->img);
@@ -643,7 +643,7 @@ _elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd)
643} 643}
644 644
645EOLIAN static void 645EOLIAN static void
646_elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y) 646_efl_ui_image_evas_object_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
647{ 647{
648 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 648 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
649 649
@@ -652,11 +652,11 @@ _elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Eva
652 sd->img_y = y; 652 sd->img_y = y;
653 653
654 /* takes care of moving */ 654 /* takes care of moving */
655 _elm_image_internal_sizing_eval(obj, sd); 655 _efl_ui_image_internal_sizing_eval(obj, sd);
656} 656}
657 657
658EOLIAN static void 658EOLIAN static void
659_elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h) 659_efl_ui_image_evas_object_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
660{ 660{
661 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 661 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
662 662
@@ -666,14 +666,14 @@ _elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, E
666 sd->img_h = h; 666 sd->img_h = h;
667 667
668 /* takes care of resizing */ 668 /* takes care of resizing */
669 _elm_image_internal_sizing_eval(obj, sd); 669 _efl_ui_image_internal_sizing_eval(obj, sd);
670} 670}
671 671
672EOLIAN static void 672EOLIAN static void
673_elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd) 673_efl_ui_image_evas_object_smart_show(Eo *obj, Efl_Ui_Image_Data *sd)
674{ 674{
675 sd->show = EINA_TRUE; 675 sd->show = EINA_TRUE;
676 if (sd->preload_status == ELM_IMAGE_PRELOADING) return; 676 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
677 677
678 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 678 evas_obj_smart_show(eo_super(obj, MY_CLASS));
679 679
@@ -683,7 +683,7 @@ _elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd)
683} 683}
684 684
685EOLIAN static void 685EOLIAN static void
686_elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd) 686_efl_ui_image_evas_object_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd)
687{ 687{
688 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 688 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
689 689
@@ -694,7 +694,7 @@ _elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd)
694} 694}
695 695
696EOLIAN static void 696EOLIAN static void
697_elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member) 697_efl_ui_image_evas_object_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
698{ 698{
699 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 699 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
700 700
@@ -703,7 +703,7 @@ _elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object
703} 703}
704 704
705EOLIAN static void 705EOLIAN static void
706_elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a) 706_efl_ui_image_evas_object_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
707{ 707{
708 evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a); 708 evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
709 709
@@ -713,7 +713,7 @@ _elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g
713} 713}
714 714
715EOLIAN static void 715EOLIAN static void
716_elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip) 716_efl_ui_image_evas_object_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
717{ 717{
718 evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip); 718 evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip);
719 719
@@ -722,7 +722,7 @@ _elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *
722} 722}
723 723
724EOLIAN static void 724EOLIAN static void
725_elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd) 725_efl_ui_image_evas_object_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
726{ 726{
727 evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS)); 727 evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS));
728 728
@@ -731,7 +731,7 @@ _elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd)
731} 731}
732 732
733EOLIAN static Eina_Bool 733EOLIAN static Eina_Bool
734_elm_image_elm_widget_theme_apply(Eo *obj, Elm_Image_Data *sd EINA_UNUSED) 734_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
735{ 735{
736 Eina_Bool int_ret = EINA_FALSE; 736 Eina_Bool int_ret = EINA_FALSE;
737 737
@@ -741,7 +741,7 @@ _elm_image_elm_widget_theme_apply(Eo *obj, Elm_Image_Data *sd EINA_UNUSED)
741 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 741 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
742 if (!int_ret) return EINA_FALSE; 742 if (!int_ret) return EINA_FALSE;
743 743
744 _elm_image_sizing_eval(obj); 744 _efl_ui_image_sizing_eval(obj);
745 745
746 return EINA_TRUE; 746 return EINA_TRUE;
747} 747}
@@ -754,7 +754,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
754} 754}
755 755
756EOLIAN static Eina_Bool 756EOLIAN static Eina_Bool
757_elm_image_elm_widget_event(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 757_efl_ui_image_elm_widget_event(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
758{ 758{
759 (void) src; 759 (void) src;
760 Evas_Event_Key_Down *ev = event_info; 760 Evas_Event_Key_Down *ev = event_info;
@@ -772,27 +772,27 @@ _elm_image_elm_widget_event(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED, Evas_Objec
772// TODO: remove this function after using the widget's scale value instead of image's scale value, 772// TODO: remove this function after using the widget's scale value instead of image's scale value,
773 773
774static void 774static void
775_elm_image_internal_scale_set(Evas_Object *obj, Elm_Image_Data *sd, double scale) 775_efl_ui_image_internal_scale_set(Evas_Object *obj, Efl_Ui_Image_Data *sd, double scale)
776{ 776{
777 sd->scale = scale; 777 sd->scale = scale;
778 _elm_image_internal_sizing_eval(obj, sd); 778 _efl_ui_image_internal_sizing_eval(obj, sd);
779} 779}
780 780
781static void 781static void
782_elm_image_sizing_eval(Eo *obj) 782_efl_ui_image_sizing_eval(Eo *obj)
783{ 783{
784 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; 784 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
785 int w = 0, h = 0; 785 int w = 0, h = 0;
786 double ts; 786 double ts;
787 787
788 ELM_IMAGE_DATA_GET(obj, sd); 788 EFL_UI_IMAGE_DATA_GET(obj, sd);
789 789
790 efl_image_smooth_scale_set(obj, sd->smooth); 790 efl_image_smooth_scale_set(obj, sd->smooth);
791 791
792 if (sd->no_scale) 792 if (sd->no_scale)
793 _elm_image_internal_scale_set(obj, sd, 1.0); 793 _efl_ui_image_internal_scale_set(obj, sd, 1.0);
794 else 794 else
795 _elm_image_internal_scale_set(obj, sd, elm_widget_scale_get(obj) * elm_config_scale_get()); 795 _efl_ui_image_internal_scale_set(obj, sd, elm_widget_scale_get(obj) * elm_config_scale_get());
796 796
797 ts = sd->scale; 797 ts = sd->scale;
798 sd->scale = 1.0; 798 sd->scale = 1.0;
@@ -835,12 +835,12 @@ _elm_image_sizing_eval(Eo *obj)
835} 835}
836 836
837static void 837static void
838_elm_image_file_set_do(Evas_Object *obj) 838_efl_ui_image_file_set_do(Evas_Object *obj)
839{ 839{
840 Evas_Object *pclip = NULL; 840 Evas_Object *pclip = NULL;
841 int w = 0, h = 0; 841 int w = 0, h = 0;
842 842
843 ELM_IMAGE_DATA_GET(obj, sd); 843 EFL_UI_IMAGE_DATA_GET(obj, sd);
844 844
845 ELM_SAFE_FREE(sd->prev_img, evas_object_del); 845 ELM_SAFE_FREE(sd->prev_img, evas_object_del);
846 if (sd->img) 846 if (sd->img)
@@ -875,7 +875,7 @@ elm_image_add(Evas_Object *parent)
875} 875}
876 876
877EOLIAN static Eo * 877EOLIAN static Eo *
878_elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED) 878_efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED)
879{ 879{
880 obj = eo_constructor(eo_super(obj, MY_CLASS)); 880 obj = eo_constructor(eo_super(obj, MY_CLASS));
881 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 881 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -886,7 +886,7 @@ _elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED)
886} 886}
887 887
888EOLIAN Eina_Bool 888EOLIAN Eina_Bool
889_elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *sd, 889_efl_ui_image_efl_file_mmap_set(Eo *obj, Efl_Ui_Image_Data *sd,
890 const Eina_File *file, const char *key) 890 const Eina_File *file, const char *key)
891{ 891{
892 Eina_Bool ret = EINA_FALSE; 892 Eina_Bool ret = EINA_FALSE;
@@ -895,23 +895,23 @@ _elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *sd,
895 sd->remote = NULL; 895 sd->remote = NULL;
896 896
897 if (!sd->async_enable) 897 if (!sd->async_enable)
898 ret = _elm_image_smart_internal_file_set(obj, sd, eina_file_filename_get(file), file, key); 898 ret = _efl_ui_image_smart_internal_file_set(obj, sd, eina_file_filename_get(file), file, key);
899 else 899 else
900 ret = _elm_image_async_file_set(obj, sd, eina_file_filename_get(file), file, key); 900 ret = _efl_ui_image_async_file_set(obj, sd, eina_file_filename_get(file), file, key);
901 901
902 return ret; 902 return ret;
903} 903}
904 904
905static Eina_Bool 905static Eina_Bool
906_elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd, 906_efl_ui_image_smart_internal_file_set(Eo *obj, Efl_Ui_Image_Data *sd,
907 const char *file, const Eina_File *f, const char *key) 907 const char *file, const Eina_File *f, const char *key)
908{ 908{
909 Evas_Load_Error err; 909 Evas_Load_Error err;
910 910
911 if (eina_str_has_extension(file, ".edj")) 911 if (eina_str_has_extension(file, ".edj"))
912 return _elm_image_edje_file_set(obj, file, f, key); 912 return _efl_ui_image_edje_file_set(obj, file, f, key);
913 913
914 _elm_image_file_set_do(obj); 914 _efl_ui_image_file_set_do(obj);
915 915
916 if (f) 916 if (f)
917 evas_object_image_mmap_set(sd->img, f, key); 917 evas_object_image_mmap_set(sd->img, f, key);
@@ -939,23 +939,23 @@ _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
939 return EINA_FALSE; 939 return EINA_FALSE;
940 } 940 }
941 941
942 if (sd->preload_status != ELM_IMAGE_PRELOAD_DISABLED) 942 if (sd->preload_status != EFL_UI_IMAGE_PRELOAD_DISABLED)
943 { 943 {
944 evas_object_hide(sd->img); 944 evas_object_hide(sd->img);
945 sd->preload_status = ELM_IMAGE_PRELOADING; 945 sd->preload_status = EFL_UI_IMAGE_PRELOADING;
946 evas_object_image_preload(sd->img, EINA_FALSE); 946 evas_object_image_preload(sd->img, EINA_FALSE);
947 } 947 }
948 948
949 _elm_image_internal_sizing_eval(obj, sd); 949 _efl_ui_image_internal_sizing_eval(obj, sd);
950 950
951 return EINA_TRUE; 951 return EINA_TRUE;
952} 952}
953 953
954static void 954static void
955_elm_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download) 955_efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
956{ 956{
957 Eo *obj = data; 957 Eo *obj = data;
958 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 958 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
959 Eina_File *f; 959 Eina_File *f;
960 size_t length; 960 size_t length;
961 Eina_Bool ret = EINA_FALSE; 961 Eina_Bool ret = EINA_FALSE;
@@ -966,7 +966,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
966 f = eina_file_virtualize(_elm_url_get(url), 966 f = eina_file_virtualize(_elm_url_get(url),
967 sd->remote_data, length, 967 sd->remote_data, length,
968 EINA_FALSE); 968 EINA_FALSE);
969 ret = _elm_image_smart_internal_file_set(obj, sd, _elm_url_get(url), f, sd->key); 969 ret = _efl_ui_image_smart_internal_file_set(obj, sd, _elm_url_get(url), f, sd->key);
970 eina_file_close(f); 970 eina_file_close(f);
971 971
972 sd->remote = NULL; 972 sd->remote = NULL;
@@ -976,44 +976,44 @@ _elm_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
976 976
977 free(sd->remote_data); 977 free(sd->remote_data);
978 sd->remote_data = NULL; 978 sd->remote_data = NULL;
979 eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 979 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
980 } 980 }
981 else 981 else
982 { 982 {
983 if (sd->preload_status != ELM_IMAGE_PRELOAD_DISABLED) 983 if (sd->preload_status != EFL_UI_IMAGE_PRELOAD_DISABLED)
984 { 984 {
985 sd->preload_status = ELM_IMAGE_PRELOADING; 985 sd->preload_status = EFL_UI_IMAGE_PRELOADING;
986 evas_object_image_preload(sd->img, EINA_FALSE); 986 evas_object_image_preload(sd->img, EINA_FALSE);
987 } 987 }
988 988
989 eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_DONE, NULL); 989 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
990 } 990 }
991 991
992 ELM_SAFE_FREE(sd->key, eina_stringshare_del); 992 ELM_SAFE_FREE(sd->key, eina_stringshare_del);
993} 993}
994 994
995static void 995static void
996_elm_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error) 996_efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
997{ 997{
998 Eo *obj = data; 998 Eo *obj = data;
999 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 999 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1000 Elm_Image_Error err = { error, EINA_FALSE }; 1000 Elm_Image_Error err = { error, EINA_FALSE };
1001 1001
1002 eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 1002 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
1003 1003
1004 sd->remote = NULL; 1004 sd->remote = NULL;
1005 ELM_SAFE_FREE(sd->key, eina_stringshare_del); 1005 ELM_SAFE_FREE(sd->key, eina_stringshare_del);
1006} 1006}
1007 1007
1008static void 1008static void
1009_elm_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now, double total) 1009_efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now, double total)
1010{ 1010{
1011 Eo *obj = data; 1011 Eo *obj = data;
1012 Elm_Image_Progress progress; 1012 Elm_Image_Progress progress;
1013 1013
1014 progress.now = now; 1014 progress.now = now;
1015 progress.total = total; 1015 progress.total = total;
1016 eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress); 1016 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
1017} 1017}
1018 1018
1019static const char *remote_uri[] = { 1019static const char *remote_uri[] = {
@@ -1021,7 +1021,7 @@ static const char *remote_uri[] = {
1021}; 1021};
1022 1022
1023EOLIAN static Eina_Bool 1023EOLIAN static Eina_Bool
1024_elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, const char *key) 1024_efl_ui_image_efl_file_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file, const char *key)
1025{ 1025{
1026 Eina_Bool ret = EINA_FALSE; 1026 Eina_Bool ret = EINA_FALSE;
1027 unsigned int i; 1027 unsigned int i;
@@ -1042,14 +1042,14 @@ _elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, cons
1042 // Found a remote target ! 1042 // Found a remote target !
1043 evas_object_hide(sd->img); 1043 evas_object_hide(sd->img);
1044 sd->remote = _elm_url_download(file, 1044 sd->remote = _elm_url_download(file,
1045 _elm_image_smart_download_done, 1045 _efl_ui_image_smart_download_done,
1046 _elm_image_smart_download_cancel, 1046 _efl_ui_image_smart_download_cancel,
1047 _elm_image_smart_download_progress, 1047 _efl_ui_image_smart_download_progress,
1048 obj); 1048 obj);
1049 if (sd->remote) 1049 if (sd->remote)
1050 { 1050 {
1051 eo_event_callback_call 1051 eo_event_callback_call
1052 (obj, ELM_IMAGE_EVENT_DOWNLOAD_START, NULL); 1052 (obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_START, NULL);
1053 eina_stringshare_replace(&sd->key, key); 1053 eina_stringshare_replace(&sd->key, key);
1054 return EINA_TRUE; 1054 return EINA_TRUE;
1055 } 1055 }
@@ -1057,22 +1057,22 @@ _elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, cons
1057 } 1057 }
1058 1058
1059 if (!sd->async_enable) 1059 if (!sd->async_enable)
1060 ret = _elm_image_smart_internal_file_set(obj, sd, file, NULL, key); 1060 ret = _efl_ui_image_smart_internal_file_set(obj, sd, file, NULL, key);
1061 else 1061 else
1062 ret = _elm_image_async_file_set(obj, sd, file, NULL, key); 1062 ret = _efl_ui_image_async_file_set(obj, sd, file, NULL, key);
1063 1063
1064 return ret; 1064 return ret;
1065} 1065}
1066 1066
1067EOLIAN static void 1067EOLIAN static void
1068_elm_image_edje_object_signal_emit(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, const char *emission, const char *source) 1068_efl_ui_image_edje_object_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char *emission, const char *source)
1069{ 1069{
1070 if (sd->edje) 1070 if (sd->edje)
1071 edje_object_signal_emit(sd->img, emission, source); 1071 edje_object_signal_emit(sd->img, emission, source);
1072} 1072}
1073 1073
1074EOLIAN static void 1074EOLIAN static void
1075_elm_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h) 1075_efl_ui_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1076{ 1076{
1077 if (sd->edje) 1077 if (sd->edje)
1078 edje_object_size_min_get(sd->img, w, h); 1078 edje_object_size_min_get(sd->img, w, h);
@@ -1081,7 +1081,7 @@ _elm_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int
1081} 1081}
1082 1082
1083EOLIAN static void 1083EOLIAN static void
1084_elm_image_edje_object_size_max_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h) 1084_efl_ui_image_edje_object_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1085{ 1085{
1086 if (sd->edje) 1086 if (sd->edje)
1087 edje_object_size_max_get(sd->img, w, h); 1087 edje_object_size_max_get(sd->img, w, h);
@@ -1090,14 +1090,14 @@ _elm_image_edje_object_size_max_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int
1090} 1090}
1091 1091
1092EOLIAN static void 1092EOLIAN static void
1093_elm_image_edje_object_calc_force(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1093_efl_ui_image_edje_object_calc_force(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1094{ 1094{
1095 if (sd->edje) 1095 if (sd->edje)
1096 edje_object_calc_force(sd->img); 1096 edje_object_calc_force(sd->img);
1097} 1097}
1098 1098
1099EOLIAN static void 1099EOLIAN static void
1100_elm_image_edje_object_size_min_calc(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h) 1100_efl_ui_image_edje_object_size_min_calc(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1101{ 1101{
1102 if (sd->edje) 1102 if (sd->edje)
1103 edje_object_size_min_calc(sd->img, w, h); 1103 edje_object_size_min_calc(sd->img, w, h);
@@ -1106,7 +1106,7 @@ _elm_image_edje_object_size_min_calc(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, in
1106} 1106}
1107 1107
1108EOLIAN static void 1108EOLIAN static void
1109_elm_image_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, const char **file, const char **key) 1109_efl_ui_image_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char **file, const char **key)
1110{ 1110{
1111 if (sd->async_enable && (sd->async_opening || sd->async_failed)) 1111 if (sd->async_enable && (sd->async_opening || sd->async_failed))
1112 { 1112 {
@@ -1119,7 +1119,7 @@ _elm_image_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, const char
1119} 1119}
1120 1120
1121static Eina_Bool 1121static Eina_Bool
1122_elm_image_efl_file_async_wait(const Eo *obj EINA_UNUSED, Elm_Image_Data *pd) 1122_efl_ui_image_efl_file_async_wait(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd)
1123{ 1123{
1124 Eina_Bool ok = EINA_TRUE; 1124 Eina_Bool ok = EINA_TRUE;
1125 if (!pd->async_enable) return ok; 1125 if (!pd->async_enable) return ok;
@@ -1133,24 +1133,24 @@ _elm_image_efl_file_async_wait(const Eo *obj EINA_UNUSED, Elm_Image_Data *pd)
1133} 1133}
1134 1134
1135EOLIAN static void 1135EOLIAN static void
1136_elm_image_efl_file_async_set(Eo *obj, Elm_Image_Data *pd, Eina_Bool async) 1136_efl_ui_image_efl_file_async_set(Eo *obj, Efl_Ui_Image_Data *pd, Eina_Bool async)
1137{ 1137{
1138 if (pd->async_enable == async) 1138 if (pd->async_enable == async)
1139 return; 1139 return;
1140 1140
1141 pd->async_enable = async; 1141 pd->async_enable = async;
1142 if (!async) 1142 if (!async)
1143 _elm_image_efl_file_async_wait(obj, pd); 1143 _efl_ui_image_efl_file_async_wait(obj, pd);
1144} 1144}
1145 1145
1146EOLIAN static Eina_Bool 1146EOLIAN static Eina_Bool
1147_elm_image_efl_file_async_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1147_efl_ui_image_efl_file_async_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1148{ 1148{
1149 return sd->async_enable; 1149 return sd->async_enable;
1150} 1150}
1151 1151
1152EOLIAN static void 1152EOLIAN static void
1153_elm_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h) 1153_efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1154{ 1154{
1155 int tw, th; 1155 int tw, th;
1156 int cw = 0, ch = 0; 1156 int cw = 0, ch = 0;
@@ -1179,12 +1179,12 @@ EAPI void
1179elm_image_prescale_set(Evas_Object *obj, 1179elm_image_prescale_set(Evas_Object *obj,
1180 int size) 1180 int size)
1181{ 1181{
1182 ELM_IMAGE_CHECK(obj); 1182 EFL_UI_IMAGE_CHECK(obj);
1183 efl_image_load_size_set(obj, size, size); 1183 efl_image_load_size_set(obj, size, size);
1184} 1184}
1185 1185
1186EOLIAN static void 1186EOLIAN static void
1187_elm_image_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int w, int h) 1187_efl_ui_image_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int w, int h)
1188{ 1188{
1189 if (w > h) 1189 if (w > h)
1190 sd->load_size = w; 1190 sd->load_size = w;
@@ -1195,7 +1195,7 @@ _elm_image_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd,
1195EAPI int 1195EAPI int
1196elm_image_prescale_get(const Evas_Object *obj) 1196elm_image_prescale_get(const Evas_Object *obj)
1197{ 1197{
1198 ELM_IMAGE_CHECK(obj) 0; 1198 EFL_UI_IMAGE_CHECK(obj) 0;
1199 1199
1200 int w = 0; 1200 int w = 0;
1201 efl_image_load_size_get((Eo *)obj, &w, NULL); 1201 efl_image_load_size_get((Eo *)obj, &w, NULL);
@@ -1203,14 +1203,14 @@ elm_image_prescale_get(const Evas_Object *obj)
1203} 1203}
1204 1204
1205EOLIAN static void 1205EOLIAN static void
1206_elm_image_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h) 1206_efl_ui_image_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1207{ 1207{
1208 if (w) *w = sd->load_size; 1208 if (w) *w = sd->load_size;
1209 if (h) *h = sd->load_size; 1209 if (h) *h = sd->load_size;
1210} 1210}
1211 1211
1212EOLIAN static void 1212EOLIAN static void
1213_elm_image_efl_orientation_orientation_set(Eo *obj, Elm_Image_Data *sd, Efl_Orient orient) 1213_efl_ui_image_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Orient orient)
1214{ 1214{
1215 if (sd->edje) return; 1215 if (sd->edje) return;
1216 if (sd->orient == orient) return; 1216 if (sd->orient == orient) return;
@@ -1218,18 +1218,18 @@ _elm_image_efl_orientation_orientation_set(Eo *obj, Elm_Image_Data *sd, Efl_Orie
1218 efl_orientation_set(sd->img, orient); 1218 efl_orientation_set(sd->img, orient);
1219 1219
1220 sd->orient = orient; 1220 sd->orient = orient;
1221 _elm_image_internal_sizing_eval(obj, sd); 1221 _efl_ui_image_internal_sizing_eval(obj, sd);
1222} 1222}
1223 1223
1224EOLIAN static Efl_Orient 1224EOLIAN static Efl_Orient
1225_elm_image_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1225_efl_ui_image_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1226{ 1226{
1227 return sd->orient; 1227 return sd->orient;
1228} 1228}
1229 1229
1230 1230
1231EOLIAN static void 1231EOLIAN static void
1232_elm_image_efl_flipable_flip_set(Eo *obj, Elm_Image_Data *sd, Efl_Flip flip) 1232_efl_ui_image_efl_flipable_flip_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Flip flip)
1233{ 1233{
1234 if (sd->edje) return; 1234 if (sd->edje) return;
1235 if (sd->flip == flip) return; 1235 if (sd->flip == flip) return;
@@ -1237,11 +1237,11 @@ _elm_image_efl_flipable_flip_set(Eo *obj, Elm_Image_Data *sd, Efl_Flip flip)
1237 efl_flip_set(sd->img, flip); 1237 efl_flip_set(sd->img, flip);
1238 1238
1239 sd->flip = flip; 1239 sd->flip = flip;
1240 _elm_image_internal_sizing_eval(obj, sd); 1240 _efl_ui_image_internal_sizing_eval(obj, sd);
1241} 1241}
1242 1242
1243EOLIAN static Efl_Flip 1243EOLIAN static Efl_Flip
1244_elm_image_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1244_efl_ui_image_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1245{ 1245{
1246 return sd->flip; 1246 return sd->flip;
1247} 1247}
@@ -1250,7 +1250,7 @@ _elm_image_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
1250 * Turns on editing through drag and drop and copy and paste. 1250 * Turns on editing through drag and drop and copy and paste.
1251 */ 1251 */
1252EOLIAN static void 1252EOLIAN static void
1253_elm_image_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool edit) 1253_efl_ui_image_evas_draggable_interface_drag_target_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool edit)
1254{ 1254{
1255 if (sd->edje) 1255 if (sd->edje)
1256 { 1256 {
@@ -1270,18 +1270,18 @@ _elm_image_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Image_Data *sd,
1270 NULL, NULL, 1270 NULL, NULL,
1271 NULL, NULL, 1271 NULL, NULL,
1272 NULL, NULL, 1272 NULL, NULL,
1273 _elm_image_drag_n_drop_cb, obj); 1273 _efl_ui_image_drag_n_drop_cb, obj);
1274 else 1274 else
1275 elm_drop_target_del 1275 elm_drop_target_del
1276 (obj, ELM_SEL_FORMAT_IMAGE, 1276 (obj, ELM_SEL_FORMAT_IMAGE,
1277 NULL, NULL, 1277 NULL, NULL,
1278 NULL, NULL, 1278 NULL, NULL,
1279 NULL, NULL, 1279 NULL, NULL,
1280 _elm_image_drag_n_drop_cb, obj); 1280 _efl_ui_image_drag_n_drop_cb, obj);
1281} 1281}
1282 1282
1283EOLIAN static Eina_Bool 1283EOLIAN static Eina_Bool
1284_elm_image_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1284_efl_ui_image_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1285{ 1285{
1286 return sd->edit; 1286 return sd->edit;
1287} 1287}
@@ -1295,7 +1295,7 @@ elm_image_animated_available_get(const Evas_Object *obj)
1295} 1295}
1296 1296
1297EOLIAN static Eina_Bool 1297EOLIAN static Eina_Bool
1298_elm_image_efl_player_playable_get(Eo *obj, Elm_Image_Data *sd) 1298_efl_ui_image_efl_player_playable_get(Eo *obj, Efl_Ui_Image_Data *sd)
1299{ 1299{
1300 if (sd->edje) return EINA_FALSE; 1300 if (sd->edje) return EINA_FALSE;
1301 1301
@@ -1303,7 +1303,7 @@ _elm_image_efl_player_playable_get(Eo *obj, Elm_Image_Data *sd)
1303} 1303}
1304 1304
1305static void 1305static void
1306_elm_image_animated_set_internal(Eo *obj, Elm_Image_Data *sd, Eina_Bool anim) 1306_efl_ui_image_animated_set_internal(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool anim)
1307{ 1307{
1308 anim = !!anim; 1308 anim = !!anim;
1309 if (sd->anim == anim) return; 1309 if (sd->anim == anim) return;
@@ -1338,7 +1338,7 @@ _elm_image_animated_set_internal(Eo *obj, Elm_Image_Data *sd, Eina_Bool anim)
1338} 1338}
1339 1339
1340static Eina_Bool 1340static Eina_Bool
1341_elm_image_animated_get_internal(const Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1341_efl_ui_image_animated_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1342{ 1342{
1343 if (sd->edje) 1343 if (sd->edje)
1344 return edje_object_animation_get(sd->img); 1344 return edje_object_animation_get(sd->img);
@@ -1348,21 +1348,21 @@ _elm_image_animated_get_internal(const Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
1348EAPI void 1348EAPI void
1349elm_image_animated_set(Evas_Object *obj, Eina_Bool anim) 1349elm_image_animated_set(Evas_Object *obj, Eina_Bool anim)
1350{ 1350{
1351 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1351 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1352 if (!sd) return; 1352 if (!sd) return;
1353 _elm_image_animated_set_internal(obj, sd, anim); 1353 _efl_ui_image_animated_set_internal(obj, sd, anim);
1354} 1354}
1355 1355
1356EAPI Eina_Bool 1356EAPI Eina_Bool
1357elm_image_animated_get(const Evas_Object *obj) 1357elm_image_animated_get(const Evas_Object *obj)
1358{ 1358{
1359 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1359 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1360 if (!sd) return EINA_FALSE; 1360 if (!sd) return EINA_FALSE;
1361 return _elm_image_animated_get_internal(obj, sd); 1361 return _efl_ui_image_animated_get_internal(obj, sd);
1362} 1362}
1363 1363
1364static void 1364static void
1365_elm_image_animated_play_set_internal(Eo *obj, Elm_Image_Data *sd, Eina_Bool play) 1365_efl_ui_image_animated_play_set_internal(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool play)
1366{ 1366{
1367 if (!sd->anim) return; 1367 if (!sd->anim) return;
1368 if (sd->play == play) return; 1368 if (sd->play == play) return;
@@ -1375,7 +1375,7 @@ _elm_image_animated_play_set_internal(Eo *obj, Elm_Image_Data *sd, Eina_Bool pla
1375 if (play) 1375 if (play)
1376 { 1376 {
1377 sd->anim_timer = ecore_timer_add 1377 sd->anim_timer = ecore_timer_add
1378 (sd->frame_duration, _elm_image_animate_cb, obj); 1378 (sd->frame_duration, _efl_ui_image_animate_cb, obj);
1379 } 1379 }
1380 else 1380 else
1381 { 1381 {
@@ -1384,7 +1384,7 @@ _elm_image_animated_play_set_internal(Eo *obj, Elm_Image_Data *sd, Eina_Bool pla
1384} 1384}
1385 1385
1386static Eina_Bool 1386static Eina_Bool
1387_elm_image_animated_play_get_internal(const Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1387_efl_ui_image_animated_play_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1388{ 1388{
1389 if (sd->edje) 1389 if (sd->edje)
1390 return edje_object_play_get(sd->img); 1390 return edje_object_play_get(sd->img);
@@ -1394,75 +1394,75 @@ _elm_image_animated_play_get_internal(const Eo *obj EINA_UNUSED, Elm_Image_Data
1394EAPI void 1394EAPI void
1395elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play) 1395elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play)
1396{ 1396{
1397 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1397 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1398 if (!sd) return; 1398 if (!sd) return;
1399 _elm_image_animated_play_set_internal(obj, sd, play); 1399 _efl_ui_image_animated_play_set_internal(obj, sd, play);
1400} 1400}
1401 1401
1402EAPI Eina_Bool 1402EAPI Eina_Bool
1403elm_image_animated_play_get(const Elm_Image *obj) 1403elm_image_animated_play_get(const Elm_Image *obj)
1404{ 1404{
1405 Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1405 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1406 if (!sd) return EINA_FALSE; 1406 if (!sd) return EINA_FALSE;
1407 return _elm_image_animated_play_get_internal(obj, sd); 1407 return _efl_ui_image_animated_play_get_internal(obj, sd);
1408} 1408}
1409 1409
1410EOLIAN static void 1410EOLIAN static void
1411_elm_image_efl_player_play_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool play) 1411_efl_ui_image_efl_player_play_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool play)
1412{ 1412{
1413 if (play && !_elm_image_animated_get_internal(obj, sd)) 1413 if (play && !_efl_ui_image_animated_get_internal(obj, sd))
1414 _elm_image_animated_set_internal(obj, sd, play); 1414 _efl_ui_image_animated_set_internal(obj, sd, play);
1415 _elm_image_animated_play_set_internal(obj, sd, play); 1415 _efl_ui_image_animated_play_set_internal(obj, sd, play);
1416} 1416}
1417 1417
1418EOLIAN static Eina_Bool 1418EOLIAN static Eina_Bool
1419_elm_image_efl_player_play_get(Eo *obj, Elm_Image_Data *sd) 1419_efl_ui_image_efl_player_play_get(Eo *obj, Efl_Ui_Image_Data *sd)
1420{ 1420{
1421 return _elm_image_animated_play_get_internal(obj, sd); 1421 return _efl_ui_image_animated_play_get_internal(obj, sd);
1422} 1422}
1423 1423
1424static void 1424static void
1425_elm_image_class_constructor(Eo_Class *klass) 1425_efl_ui_image_class_constructor(Eo_Class *klass)
1426{ 1426{
1427 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1427 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1428} 1428}
1429 1429
1430EOLIAN static void 1430EOLIAN static void
1431_elm_image_scale_type_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd EINA_UNUSED, Elm_Image_Scale_Type scale_type) 1431_efl_ui_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Ui_Image_Scale_Type scale_type)
1432{ 1432{
1433 if (scale_type == sd->scale_type) return; 1433 if (scale_type == sd->scale_type) return;
1434 1434
1435 sd->scale_type = scale_type; 1435 sd->scale_type = scale_type;
1436 1436
1437 _elm_image_internal_sizing_eval(obj, sd); 1437 _efl_ui_image_internal_sizing_eval(obj, sd);
1438} 1438}
1439 1439
1440EOLIAN static Elm_Image_Scale_Type 1440EOLIAN static Efl_Ui_Image_Scale_Type
1441_elm_image_scale_type_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1441_efl_ui_image_scale_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1442{ 1442{
1443 return sd->scale_type; 1443 return sd->scale_type;
1444} 1444}
1445 1445
1446EOLIAN static void 1446EOLIAN static void
1447_elm_image_scalable_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool up, Eina_Bool down) 1447_efl_ui_image_scalable_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool up, Eina_Bool down)
1448{ 1448{
1449 if ((up == sd->scale_up) && (down == sd->scale_down)) return; 1449 if ((up == sd->scale_up) && (down == sd->scale_down)) return;
1450 1450
1451 sd->scale_up = !!up; 1451 sd->scale_up = !!up;
1452 sd->scale_down = !!down; 1452 sd->scale_down = !!down;
1453 1453
1454 _elm_image_internal_sizing_eval(obj, sd); 1454 _efl_ui_image_internal_sizing_eval(obj, sd);
1455} 1455}
1456 1456
1457EOLIAN static void 1457EOLIAN static void
1458_elm_image_scalable_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, Eina_Bool *scale_up, Eina_Bool *scale_down) 1458_efl_ui_image_scalable_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Bool *scale_up, Eina_Bool *scale_down)
1459{ 1459{
1460 if (scale_up) *scale_up = sd->scale_up; 1460 if (scale_up) *scale_up = sd->scale_up;
1461 if (scale_down) *scale_down = sd->scale_down; 1461 if (scale_down) *scale_down = sd->scale_down;
1462} 1462}
1463 1463
1464EOLIAN static void 1464EOLIAN static void
1465_elm_image_align_set(Eo *obj, Elm_Image_Data *sd, double align_x, double align_y) 1465_efl_ui_image_align_set(Eo *obj, Efl_Ui_Image_Data *sd, double align_x, double align_y)
1466{ 1466{
1467 if (align_x > 1.0) 1467 if (align_x > 1.0)
1468 align_x = 1.0; 1468 align_x = 1.0;
@@ -1479,11 +1479,11 @@ _elm_image_align_set(Eo *obj, Elm_Image_Data *sd, double align_x, double align_y
1479 sd->align_x = align_x; 1479 sd->align_x = align_x;
1480 sd->align_y = align_y; 1480 sd->align_y = align_y;
1481 1481
1482 _elm_image_internal_sizing_eval(obj, sd); 1482 _efl_ui_image_internal_sizing_eval(obj, sd);
1483} 1483}
1484 1484
1485EOLIAN static void 1485EOLIAN static void
1486_elm_image_align_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, double *align_x, double *align_y) 1486_efl_ui_image_align_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, double *align_x, double *align_y)
1487{ 1487{
1488 if (align_x) *align_x = sd->align_x; 1488 if (align_x) *align_x = sd->align_x;
1489 if (align_y) *align_y = sd->align_y; 1489 if (align_y) *align_y = sd->align_y;
@@ -1492,7 +1492,7 @@ _elm_image_align_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, double *align_x, d
1492// A11Y 1492// A11Y
1493 1493
1494EOLIAN static void 1494EOLIAN static void
1495_elm_image_elm_interface_atspi_image_extents_get(Eo *obj, Elm_Image_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) 1495_efl_ui_image_elm_interface_atspi_image_extents_get(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h)
1496{ 1496{
1497 int ee_x, ee_y; 1497 int ee_x, ee_y;
1498 Evas_Object *image = elm_image_object_get(obj); 1498 Evas_Object *image = elm_image_object_get(obj);
@@ -1511,7 +1511,7 @@ _elm_image_elm_interface_atspi_image_extents_get(Eo *obj, Elm_Image_Data *sd EIN
1511} 1511}
1512 1512
1513EOLIAN const Elm_Atspi_Action * 1513EOLIAN const Elm_Atspi_Action *
1514_elm_image_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Image_Data *pd EINA_UNUSED) 1514_efl_ui_image_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd EINA_UNUSED)
1515{ 1515{
1516 static Elm_Atspi_Action atspi_actions[] = { 1516 static Elm_Atspi_Action atspi_actions[] = {
1517 { "activate", "activate", NULL, _key_action_activate }, 1517 { "activate", "activate", NULL, _key_action_activate },
@@ -1523,7 +1523,7 @@ _elm_image_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
1523static Eina_Bool 1523static Eina_Bool
1524_icon_standard_set(Evas_Object *obj, const char *name) 1524_icon_standard_set(Evas_Object *obj, const char *name)
1525{ 1525{
1526 ELM_IMAGE_DATA_GET(obj, sd); 1526 EFL_UI_IMAGE_DATA_GET(obj, sd);
1527 1527
1528 if (_elm_theme_object_icon_set(obj, name, "default")) 1528 if (_elm_theme_object_icon_set(obj, name, "default"))
1529 { 1529 {
@@ -1539,7 +1539,7 @@ _icon_freedesktop_set(Evas_Object *obj, const char *name, int size)
1539{ 1539{
1540 const char *path; 1540 const char *path;
1541 1541
1542 ELM_IMAGE_DATA_GET(obj, sd); 1542 EFL_UI_IMAGE_DATA_GET(obj, sd);
1543 1543
1544 elm_need_efreet(); 1544 elm_need_efreet();
1545 1545
@@ -1612,12 +1612,12 @@ _path_is_absolute(const char *path)
1612#endif 1612#endif
1613 1613
1614static Eina_Bool 1614static Eina_Bool
1615_internal_elm_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo) 1615_internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo)
1616{ 1616{
1617 char *tmp; 1617 char *tmp;
1618 Eina_Bool ret = EINA_FALSE; 1618 Eina_Bool ret = EINA_FALSE;
1619 1619
1620 ELM_IMAGE_DATA_GET(obj, sd); 1620 EFL_UI_IMAGE_DATA_GET(obj, sd);
1621 1621
1622 /* try locating the icon using the specified theme */ 1622 /* try locating the icon using the specified theme */
1623 if (!strcmp(ELM_CONFIG_ICON_THEME_ELEMENTARY, elm_config_icon_theme_get())) 1623 if (!strcmp(ELM_CONFIG_ICON_THEME_ELEMENTARY, elm_config_icon_theme_get()))
@@ -1634,7 +1634,7 @@ _internal_elm_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo)
1634 if (ret) 1634 if (ret)
1635 { 1635 {
1636 eina_stringshare_replace(&sd->stdicon, name); 1636 eina_stringshare_replace(&sd->stdicon, name);
1637 _elm_image_sizing_eval(obj); 1637 _efl_ui_image_sizing_eval(obj);
1638 return EINA_TRUE; 1638 return EINA_TRUE;
1639 } 1639 }
1640 1640
@@ -1649,45 +1649,45 @@ _internal_elm_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo)
1649 try locating a fallback without the size specification */ 1649 try locating a fallback without the size specification */
1650 if (!(tmp = strchr(name, '/'))) return EINA_FALSE; 1650 if (!(tmp = strchr(name, '/'))) return EINA_FALSE;
1651 ++tmp; 1651 ++tmp;
1652 if (*tmp) return _internal_elm_image_icon_set(obj, tmp, fdo); 1652 if (*tmp) return _internal_efl_ui_image_icon_set(obj, tmp, fdo);
1653 /* give up */ 1653 /* give up */
1654 return EINA_FALSE; 1654 return EINA_FALSE;
1655} 1655}
1656 1656
1657static void 1657static void
1658_elm_image_icon_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 1658_efl_ui_image_icon_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
1659{ 1659{
1660 ELM_IMAGE_DATA_GET(data, sd); 1660 EFL_UI_IMAGE_DATA_GET(data, sd);
1661 const char *refup = eina_stringshare_ref(sd->stdicon); 1661 const char *refup = eina_stringshare_ref(sd->stdicon);
1662 Eina_Bool fdo = EINA_FALSE; 1662 Eina_Bool fdo = EINA_FALSE;
1663 1663
1664 if (!_internal_elm_image_icon_set(obj, sd->stdicon, &fdo) || (!fdo)) 1664 if (!_internal_efl_ui_image_icon_set(obj, sd->stdicon, &fdo) || (!fdo))
1665 evas_object_event_callback_del_full 1665 evas_object_event_callback_del_full
1666 (obj, EVAS_CALLBACK_RESIZE, _elm_image_icon_resize_cb, data); 1666 (obj, EVAS_CALLBACK_RESIZE, _efl_ui_image_icon_resize_cb, data);
1667 eina_stringshare_del(refup); 1667 eina_stringshare_del(refup);
1668} 1668}
1669 1669
1670EOLIAN static Eina_Bool 1670EOLIAN static Eina_Bool
1671_elm_image_icon_set(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED, const char *name) 1671_efl_ui_image_icon_set(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, const char *name)
1672{ 1672{
1673 Eina_Bool fdo = EINA_FALSE; 1673 Eina_Bool fdo = EINA_FALSE;
1674 1674
1675 if (!name) return EINA_FALSE; 1675 if (!name) return EINA_FALSE;
1676 1676
1677 evas_object_event_callback_del_full 1677 evas_object_event_callback_del_full
1678 (obj, EVAS_CALLBACK_RESIZE, _elm_image_icon_resize_cb, obj); 1678 (obj, EVAS_CALLBACK_RESIZE, _efl_ui_image_icon_resize_cb, obj);
1679 1679
1680 Eina_Bool int_ret = _internal_elm_image_icon_set(obj, name, &fdo); 1680 Eina_Bool int_ret = _internal_efl_ui_image_icon_set(obj, name, &fdo);
1681 1681
1682 if (fdo) 1682 if (fdo)
1683 evas_object_event_callback_add 1683 evas_object_event_callback_add
1684 (obj, EVAS_CALLBACK_RESIZE, _elm_image_icon_resize_cb, obj); 1684 (obj, EVAS_CALLBACK_RESIZE, _efl_ui_image_icon_resize_cb, obj);
1685 1685
1686 return int_ret; 1686 return int_ret;
1687} 1687}
1688 1688
1689EOLIAN static const char* 1689EOLIAN static const char*
1690_elm_image_icon_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1690_efl_ui_image_icon_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1691{ 1691{
1692 return sd->stdicon; 1692 return sd->stdicon;
1693} 1693}
@@ -1696,7 +1696,7 @@ EAPI void
1696elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth) 1696elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth)
1697{ 1697{
1698 efl_image_smooth_scale_set(obj, smooth); 1698 efl_image_smooth_scale_set(obj, smooth);
1699 _elm_image_sizing_eval(obj); 1699 _efl_ui_image_sizing_eval(obj);
1700} 1700}
1701 1701
1702EAPI Eina_Bool 1702EAPI Eina_Bool
@@ -1725,9 +1725,9 @@ elm_image_file_set(Evas_Object *obj, const char *file, const char *group)
1725{ 1725{
1726 Eina_Bool ret = EINA_FALSE; 1726 Eina_Bool ret = EINA_FALSE;
1727 1727
1728 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1728 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1729 ret = efl_file_set(obj, file, group); 1729 ret = efl_file_set(obj, file, group);
1730 _elm_image_sizing_eval(obj); 1730 _efl_ui_image_sizing_eval(obj);
1731 return ret; 1731 return ret;
1732} 1732}
1733 1733
@@ -1742,7 +1742,7 @@ elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group)
1742{ 1742{
1743 Eina_Bool ret = EINA_FALSE; 1743 Eina_Bool ret = EINA_FALSE;
1744 1744
1745 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1745 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1746 ret = efl_file_mmap_set(obj, file, group); 1746 ret = efl_file_mmap_set(obj, file, group);
1747 return ret; 1747 return ret;
1748} 1748}
@@ -1752,15 +1752,15 @@ elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char
1752{ 1752{
1753 Evas_Load_Error err; 1753 Evas_Load_Error err;
1754 1754
1755 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1755 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1756 ELM_IMAGE_DATA_GET(obj, sd); 1756 EFL_UI_IMAGE_DATA_GET(obj, sd);
1757 1757
1758 _elm_image_file_set_do(obj); 1758 _efl_ui_image_file_set_do(obj);
1759 1759
1760 evas_object_image_memfile_set 1760 evas_object_image_memfile_set
1761 (sd->img, (void *)img, size, (char *)format, (char *)key); 1761 (sd->img, (void *)img, size, (char *)format, (char *)key);
1762 1762
1763 sd->preload_status = ELM_IMAGE_PRELOADING; 1763 sd->preload_status = EFL_UI_IMAGE_PRELOADING;
1764 evas_object_image_preload(sd->img, EINA_FALSE); 1764 evas_object_image_preload(sd->img, EINA_FALSE);
1765 1765
1766 err = evas_object_image_load_error_get(sd->img); 1766 err = evas_object_image_load_error_get(sd->img);
@@ -1774,7 +1774,7 @@ elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char
1774 return EINA_FALSE; 1774 return EINA_FALSE;
1775 } 1775 }
1776 1776
1777 _elm_image_internal_sizing_eval(obj, sd); 1777 _efl_ui_image_internal_sizing_eval(obj, sd);
1778 1778
1779 return EINA_TRUE; 1779 return EINA_TRUE;
1780} 1780}
@@ -1785,19 +1785,19 @@ EAPI void
1785elm_image_scale_set(Evas_Object *obj, 1785elm_image_scale_set(Evas_Object *obj,
1786 double scale) 1786 double scale)
1787{ 1787{
1788 ELM_IMAGE_CHECK(obj); 1788 EFL_UI_IMAGE_CHECK(obj);
1789 ELM_IMAGE_DATA_GET(obj, sd); 1789 EFL_UI_IMAGE_DATA_GET(obj, sd);
1790 1790
1791 sd->scale = scale; 1791 sd->scale = scale;
1792 1792
1793 _elm_image_internal_sizing_eval(obj, sd); 1793 _efl_ui_image_internal_sizing_eval(obj, sd);
1794} 1794}
1795 1795
1796EAPI double 1796EAPI double
1797elm_image_scale_get(const Evas_Object *obj) 1797elm_image_scale_get(const Evas_Object *obj)
1798{ 1798{
1799 ELM_IMAGE_CHECK(obj) -1; 1799 EFL_UI_IMAGE_CHECK(obj) -1;
1800 ELM_IMAGE_DATA_GET(obj, sd); 1800 EFL_UI_IMAGE_DATA_GET(obj, sd);
1801 1801
1802 return sd->scale; 1802 return sd->scale;
1803} 1803}
@@ -1805,8 +1805,8 @@ elm_image_scale_get(const Evas_Object *obj)
1805EAPI void 1805EAPI void
1806elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside) 1806elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
1807{ 1807{
1808 ELM_IMAGE_CHECK(obj); 1808 EFL_UI_IMAGE_CHECK(obj);
1809 ELM_IMAGE_DATA_GET(obj, sd); 1809 EFL_UI_IMAGE_DATA_GET(obj, sd);
1810 fill_outside = !!fill_outside; 1810 fill_outside = !!fill_outside;
1811 1811
1812 if (sd->fill_inside == !fill_outside) return; 1812 if (sd->fill_inside == !fill_outside) return;
@@ -1815,20 +1815,20 @@ elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
1815 1815
1816 if (sd->aspect_fixed) 1816 if (sd->aspect_fixed)
1817 { 1817 {
1818 if (sd->fill_inside) sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_INSIDE; 1818 if (sd->fill_inside) sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE;
1819 else sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 1819 else sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
1820 } 1820 }
1821 else 1821 else
1822 sd->scale_type = ELM_IMAGE_SCALE_TYPE_FILL; 1822 sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FILL;
1823 1823
1824 _elm_image_internal_sizing_eval(obj, sd); 1824 _efl_ui_image_internal_sizing_eval(obj, sd);
1825} 1825}
1826 1826
1827EAPI Eina_Bool 1827EAPI Eina_Bool
1828elm_image_fill_outside_get(const Evas_Object *obj) 1828elm_image_fill_outside_get(const Evas_Object *obj)
1829{ 1829{
1830 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1830 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1831 ELM_IMAGE_DATA_GET(obj, sd); 1831 EFL_UI_IMAGE_DATA_GET(obj, sd);
1832 1832
1833 return !sd->fill_inside; 1833 return !sd->fill_inside;
1834} 1834}
@@ -1837,24 +1837,24 @@ elm_image_fill_outside_get(const Evas_Object *obj)
1837EAPI void 1837EAPI void
1838elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disable) 1838elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disable)
1839{ 1839{
1840 ELM_IMAGE_CHECK(obj); 1840 EFL_UI_IMAGE_CHECK(obj);
1841 ELM_IMAGE_DATA_GET(obj, sd); 1841 EFL_UI_IMAGE_DATA_GET(obj, sd);
1842 1842
1843 if (sd->edje || !sd->img) return; 1843 if (sd->edje || !sd->img) return;
1844 1844
1845 if (disable) 1845 if (disable)
1846 { 1846 {
1847 if (sd->preload_status == ELM_IMAGE_PRELOADING) 1847 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING)
1848 { 1848 {
1849 evas_object_image_preload(sd->img, disable); 1849 evas_object_image_preload(sd->img, disable);
1850 if (sd->show) evas_object_show(sd->img); 1850 if (sd->show) evas_object_show(sd->img);
1851 ELM_SAFE_FREE(sd->prev_img, evas_object_del); 1851 ELM_SAFE_FREE(sd->prev_img, evas_object_del);
1852 } 1852 }
1853 sd->preload_status = ELM_IMAGE_PRELOAD_DISABLED; 1853 sd->preload_status = EFL_UI_IMAGE_PRELOAD_DISABLED;
1854 } 1854 }
1855 else if (sd->preload_status == ELM_IMAGE_PRELOAD_DISABLED) 1855 else if (sd->preload_status == EFL_UI_IMAGE_PRELOAD_DISABLED)
1856 { 1856 {
1857 sd->preload_status = ELM_IMAGE_PRELOADING; 1857 sd->preload_status = EFL_UI_IMAGE_PRELOADING;
1858 evas_object_image_preload(sd->img, disable); 1858 evas_object_image_preload(sd->img, disable);
1859 } 1859 }
1860} 1860}
@@ -1865,7 +1865,7 @@ elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
1865 Efl_Orient dir; 1865 Efl_Orient dir;
1866 Efl_Flip flip; 1866 Efl_Flip flip;
1867 1867
1868 ELM_IMAGE_DATA_GET(obj, sd); 1868 EFL_UI_IMAGE_DATA_GET(obj, sd);
1869 sd->image_orient = orient; 1869 sd->image_orient = orient;
1870 1870
1871 switch (orient) 1871 switch (orient)
@@ -1915,8 +1915,8 @@ elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
1915EAPI Elm_Image_Orient 1915EAPI Elm_Image_Orient
1916elm_image_orient_get(const Evas_Object *obj) 1916elm_image_orient_get(const Evas_Object *obj)
1917{ 1917{
1918 ELM_IMAGE_CHECK(obj) ELM_IMAGE_ORIENT_NONE; 1918 EFL_UI_IMAGE_CHECK(obj) ELM_IMAGE_ORIENT_NONE;
1919 ELM_IMAGE_DATA_GET(obj, sd); 1919 EFL_UI_IMAGE_DATA_GET(obj, sd);
1920 1920
1921 return sd->image_orient; 1921 return sd->image_orient;
1922} 1922}
@@ -1924,8 +1924,8 @@ elm_image_orient_get(const Evas_Object *obj)
1924EAPI Evas_Object* 1924EAPI Evas_Object*
1925elm_image_object_get(const Evas_Object *obj) 1925elm_image_object_get(const Evas_Object *obj)
1926{ 1926{
1927 ELM_IMAGE_CHECK(obj) NULL; 1927 EFL_UI_IMAGE_CHECK(obj) NULL;
1928 ELM_IMAGE_DATA_GET(obj, sd); 1928 EFL_UI_IMAGE_DATA_GET(obj, sd);
1929 return sd->img; 1929 return sd->img;
1930} 1930}
1931 1931
@@ -1938,8 +1938,8 @@ elm_image_object_size_get(const Evas_Object *obj, int *w, int *h)
1938EAPI void 1938EAPI void
1939elm_image_resize_down_set(Evas_Object *obj, Eina_Bool resize_down) 1939elm_image_resize_down_set(Evas_Object *obj, Eina_Bool resize_down)
1940{ 1940{
1941 ELM_IMAGE_CHECK(obj); 1941 EFL_UI_IMAGE_CHECK(obj);
1942 ELM_IMAGE_DATA_GET(obj, sd); 1942 EFL_UI_IMAGE_DATA_GET(obj, sd);
1943 1943
1944 resize_down = !!resize_down; 1944 resize_down = !!resize_down;
1945 1945
@@ -1947,22 +1947,22 @@ elm_image_resize_down_set(Evas_Object *obj, Eina_Bool resize_down)
1947 1947
1948 sd->scale_down = resize_down; 1948 sd->scale_down = resize_down;
1949 1949
1950 _elm_image_internal_sizing_eval(obj, sd); 1950 _efl_ui_image_internal_sizing_eval(obj, sd);
1951} 1951}
1952 1952
1953EAPI Eina_Bool 1953EAPI Eina_Bool
1954elm_image_resize_down_get(const Evas_Object *obj) 1954elm_image_resize_down_get(const Evas_Object *obj)
1955{ 1955{
1956 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1956 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1957 ELM_IMAGE_DATA_GET(obj, sd); 1957 EFL_UI_IMAGE_DATA_GET(obj, sd);
1958 return sd->scale_down; 1958 return sd->scale_down;
1959} 1959}
1960 1960
1961EAPI void 1961EAPI void
1962elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up) 1962elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up)
1963{ 1963{
1964 ELM_IMAGE_CHECK(obj); 1964 EFL_UI_IMAGE_CHECK(obj);
1965 ELM_IMAGE_DATA_GET(obj, sd); 1965 EFL_UI_IMAGE_DATA_GET(obj, sd);
1966 1966
1967 resize_up = !!resize_up; 1967 resize_up = !!resize_up;
1968 1968
@@ -1970,58 +1970,58 @@ elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up)
1970 1970
1971 sd->scale_up = resize_up; 1971 sd->scale_up = resize_up;
1972 1972
1973 _elm_image_internal_sizing_eval(obj, sd); 1973 _efl_ui_image_internal_sizing_eval(obj, sd);
1974} 1974}
1975 1975
1976EAPI Eina_Bool 1976EAPI Eina_Bool
1977elm_image_resize_up_get(const Evas_Object *obj) 1977elm_image_resize_up_get(const Evas_Object *obj)
1978{ 1978{
1979 ELM_IMAGE_CHECK(obj) EINA_FALSE; 1979 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
1980 ELM_IMAGE_DATA_GET(obj, sd); 1980 EFL_UI_IMAGE_DATA_GET(obj, sd);
1981 return sd->scale_up; 1981 return sd->scale_up;
1982} 1982}
1983 1983
1984EAPI void 1984EAPI void
1985elm_image_sizing_eval(Evas_Object *obj) 1985elm_image_sizing_eval(Evas_Object *obj)
1986{ 1986{
1987 ELM_IMAGE_CHECK(obj); 1987 EFL_UI_IMAGE_CHECK(obj);
1988 _elm_image_sizing_eval(obj); 1988 _efl_ui_image_sizing_eval(obj);
1989} 1989}
1990 1990
1991EAPI void 1991EAPI void
1992elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale) 1992elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
1993{ 1993{
1994 ELM_IMAGE_CHECK(obj); 1994 EFL_UI_IMAGE_CHECK(obj);
1995 ELM_IMAGE_DATA_GET(obj, sd); 1995 EFL_UI_IMAGE_DATA_GET(obj, sd);
1996 sd->no_scale = no_scale; 1996 sd->no_scale = no_scale;
1997 1997
1998 _elm_image_sizing_eval(obj); 1998 _efl_ui_image_sizing_eval(obj);
1999} 1999}
2000 2000
2001EAPI Eina_Bool 2001EAPI Eina_Bool
2002elm_image_no_scale_get(const Evas_Object *obj) 2002elm_image_no_scale_get(const Evas_Object *obj)
2003{ 2003{
2004 ELM_IMAGE_CHECK(obj) EINA_FALSE; 2004 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
2005 ELM_IMAGE_DATA_GET(obj, sd); 2005 EFL_UI_IMAGE_DATA_GET(obj, sd);
2006 return sd->no_scale; 2006 return sd->no_scale;
2007} 2007}
2008 2008
2009EAPI void 2009EAPI void
2010elm_image_resizable_set(Evas_Object *obj, Eina_Bool up, Eina_Bool down) 2010elm_image_resizable_set(Evas_Object *obj, Eina_Bool up, Eina_Bool down)
2011{ 2011{
2012 ELM_IMAGE_CHECK(obj); 2012 EFL_UI_IMAGE_CHECK(obj);
2013 ELM_IMAGE_DATA_GET(obj, sd); 2013 EFL_UI_IMAGE_DATA_GET(obj, sd);
2014 sd->scale_up = !!up; 2014 sd->scale_up = !!up;
2015 sd->scale_down = !!down; 2015 sd->scale_down = !!down;
2016 2016
2017 _elm_image_internal_sizing_eval(obj, sd); 2017 _efl_ui_image_internal_sizing_eval(obj, sd);
2018} 2018}
2019 2019
2020EAPI void 2020EAPI void
2021elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down) 2021elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down)
2022{ 2022{
2023 ELM_IMAGE_CHECK(obj); 2023 EFL_UI_IMAGE_CHECK(obj);
2024 ELM_IMAGE_DATA_GET(obj, sd); 2024 EFL_UI_IMAGE_DATA_GET(obj, sd);
2025 if (size_up) *size_up = sd->scale_up; 2025 if (size_up) *size_up = sd->scale_up;
2026 if (size_down) *size_down = sd->scale_down; 2026 if (size_down) *size_down = sd->scale_down;
2027} 2027}
@@ -2029,8 +2029,8 @@ elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *s
2029EAPI void 2029EAPI void
2030elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside) 2030elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
2031{ 2031{
2032 ELM_IMAGE_CHECK(obj); 2032 EFL_UI_IMAGE_CHECK(obj);
2033 ELM_IMAGE_DATA_GET(obj, sd); 2033 EFL_UI_IMAGE_DATA_GET(obj, sd);
2034 fill_inside = !!fill_inside; 2034 fill_inside = !!fill_inside;
2035 2035
2036 if (sd->fill_inside == fill_inside) return; 2036 if (sd->fill_inside == fill_inside) return;
@@ -2039,28 +2039,28 @@ elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
2039 2039
2040 if (sd->aspect_fixed) 2040 if (sd->aspect_fixed)
2041 { 2041 {
2042 if (sd->fill_inside) sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_INSIDE; 2042 if (sd->fill_inside) sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE;
2043 else sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 2043 else sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
2044 } 2044 }
2045 else 2045 else
2046 sd->scale_type = ELM_IMAGE_SCALE_TYPE_FILL; 2046 sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FILL;
2047 2047
2048 _elm_image_internal_sizing_eval(obj, sd); 2048 _efl_ui_image_internal_sizing_eval(obj, sd);
2049} 2049}
2050 2050
2051EAPI Eina_Bool 2051EAPI Eina_Bool
2052elm_image_fill_inside_get(const Evas_Object *obj) 2052elm_image_fill_inside_get(const Evas_Object *obj)
2053{ 2053{
2054 ELM_IMAGE_CHECK(obj) EINA_FALSE; 2054 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
2055 ELM_IMAGE_DATA_GET(obj, sd); 2055 EFL_UI_IMAGE_DATA_GET(obj, sd);
2056 return sd->fill_inside; 2056 return sd->fill_inside;
2057} 2057}
2058 2058
2059EAPI void 2059EAPI void
2060elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed) 2060elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
2061{ 2061{
2062 ELM_IMAGE_CHECK(obj); 2062 EFL_UI_IMAGE_CHECK(obj);
2063 ELM_IMAGE_DATA_GET(obj, sd); 2063 EFL_UI_IMAGE_DATA_GET(obj, sd);
2064 fixed = !!fixed; 2064 fixed = !!fixed;
2065 if (sd->aspect_fixed == fixed) return; 2065 if (sd->aspect_fixed == fixed) return;
2066 2066
@@ -2068,21 +2068,21 @@ elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
2068 2068
2069 if (sd->aspect_fixed) 2069 if (sd->aspect_fixed)
2070 { 2070 {
2071 if (sd->fill_inside) sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_INSIDE; 2071 if (sd->fill_inside) sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE;
2072 else sd->scale_type = ELM_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 2072 else sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
2073 } 2073 }
2074 else 2074 else
2075 sd->scale_type = ELM_IMAGE_SCALE_TYPE_FILL; 2075 sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FILL;
2076 2076
2077 _elm_image_internal_sizing_eval(obj, sd); 2077 _efl_ui_image_internal_sizing_eval(obj, sd);
2078} 2078}
2079 2079
2080EAPI Eina_Bool 2080EAPI Eina_Bool
2081elm_image_aspect_fixed_get(const Evas_Object *obj) 2081elm_image_aspect_fixed_get(const Evas_Object *obj)
2082{ 2082{
2083 ELM_IMAGE_CHECK(obj) EINA_FALSE; 2083 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
2084 ELM_IMAGE_DATA_GET(obj, sd); 2084 EFL_UI_IMAGE_DATA_GET(obj, sd);
2085 return sd->aspect_fixed; 2085 return sd->aspect_fixed;
2086} 2086}
2087 2087
2088#include "elm_image.eo.c" 2088#include "efl_ui_image.eo.c"
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/efl_ui_image.eo
index e03591dc49..a485366ea9 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -1,6 +1,6 @@
1import evas_image; 1import evas_image;
2 2
3enum Elm.Image.Scale_Type 3enum Efl.Ui.Image.Scale_Type
4{ 4{
5 [[Enumeration that defines scale types for the object's internal image. 5 [[Enumeration that defines scale types for the object's internal image.
6 6
@@ -24,7 +24,7 @@ enum Elm.Image.Scale_Type
24 none [[Not scale the internal image]] 24 none [[Not scale the internal image]]
25} 25}
26 26
27struct Elm.Image.Progress 27struct Efl.Ui.Image.Progress
28{ 28{
29 [[ 29 [[
30 Structure associated with smart callback 'download,progress'. 30 Structure associated with smart callback 'download,progress'.
@@ -34,7 +34,7 @@ struct Elm.Image.Progress
34 total: double; 34 total: double;
35} 35}
36 36
37struct Elm.Image.Error 37struct Efl.Ui.Image.Error
38{ 38{
39 [[ 39 [[
40 Structure associated with smart callback 'download,progress'. 40 Structure associated with smart callback 'download,progress'.
@@ -44,14 +44,12 @@ struct Elm.Image.Error
44 open_error: bool; 44 open_error: bool;
45} 45}
46 46
47class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface, 47class Efl.Ui.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
48 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 48 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
49 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action, 49 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
50 Edje.Object, Efl.Orientation, Efl.Flipable) 50 Edje.Object, Efl.Orientation, Efl.Flipable)
51{ 51{
52 legacy_prefix: elm_image; 52 event_prefix: efl_ui_image;
53 eo_prefix: elm_obj_image;
54 event_prefix: elm_image;
55 methods { 53 methods {
56 @property scale_type { 54 @property scale_type {
57 [[Control how the internal image is scaled. 55 [[Control how the internal image is scaled.
@@ -62,7 +60,7 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
62 get { 60 get {
63 } 61 }
64 values { 62 values {
65 scale_type: Elm.Image.Scale_Type; 63 scale_type: Efl.Ui.Image.Scale_Type;
66 } 64 }
67 } 65 }
68 @property scalable { 66 @property scalable {
diff --git a/src/lib/elementary/elm_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index fc219b9690..fd64a0c4af 100644
--- a/src/lib/elementary/elm_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -12,11 +12,11 @@
12typedef struct _Async_Open_Data Async_Open_Data; 12typedef struct _Async_Open_Data Async_Open_Data;
13typedef enum 13typedef enum
14 { 14 {
15 ELM_IMAGE_PRELOAD_ENABLED, 15 EFL_UI_IMAGE_PRELOAD_ENABLED,
16 ELM_IMAGE_PRELOADING, 16 EFL_UI_IMAGE_PRELOADING,
17 ELM_IMAGE_PRELOADED, 17 EFL_UI_IMAGE_PRELOADED,
18 ELM_IMAGE_PRELOAD_DISABLED 18 EFL_UI_IMAGE_PRELOAD_DISABLED
19 } Elm_Image_Preload_Status; 19 } Efl_Ui_Image_Preload_Status;
20 20
21/** 21/**
22 * @addtogroup Widget 22 * @addtogroup Widget
@@ -40,8 +40,8 @@ typedef enum
40/** 40/**
41 * Base widget smart data extended with image instance data. 41 * Base widget smart data extended with image instance data.
42 */ 42 */
43typedef struct _Elm_Image_Data Elm_Image_Data; 43typedef struct _Efl_Ui_Image_Data Efl_Ui_Image_Data;
44struct _Elm_Image_Data 44struct _Efl_Ui_Image_Data
45{ 45{
46 Evas_Object *hit_rect; 46 Evas_Object *hit_rect;
47 Evas_Object *img; 47 Evas_Object *img;
@@ -73,8 +73,8 @@ struct _Elm_Image_Data
73 Eina_Spinlock lck; 73 Eina_Spinlock lck;
74 } async; 74 } async;
75 75
76 Elm_Image_Preload_Status preload_status; 76 Efl_Ui_Image_Preload_Status preload_status;
77 Elm_Image_Scale_Type scale_type; 77 Efl_Ui_Image_Scale_Type scale_type;
78 78
79 const char *stdicon; 79 const char *stdicon;
80 80
@@ -106,11 +106,11 @@ struct _Elm_Image_Data
106 * @} 106 * @}
107 */ 107 */
108 108
109#define ELM_IMAGE_DATA_GET(o, sd) \ 109#define EFL_UI_IMAGE_DATA_GET(o, sd) \
110 Elm_Image_Data * sd = eo_data_scope_get(o, ELM_IMAGE_CLASS) 110 Efl_Ui_Image_Data * sd = eo_data_scope_get(o, EFL_UI_IMAGE_CLASS)
111 111
112#define ELM_IMAGE_DATA_GET_OR_RETURN(o, ptr) \ 112#define EFL_UI_IMAGE_DATA_GET_OR_RETURN(o, ptr) \
113 ELM_IMAGE_DATA_GET(o, ptr); \ 113 EFL_UI_IMAGE_DATA_GET(o, ptr); \
114 if (EINA_UNLIKELY(!ptr)) \ 114 if (EINA_UNLIKELY(!ptr)) \
115 { \ 115 { \
116 CRI("No widget data for object %p (%s)", \ 116 CRI("No widget data for object %p (%s)", \
@@ -118,8 +118,8 @@ struct _Elm_Image_Data
118 return; \ 118 return; \
119 } 119 }
120 120
121#define ELM_IMAGE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ 121#define EFL_UI_IMAGE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
122 ELM_IMAGE_DATA_GET(o, ptr); \ 122 EFL_UI_IMAGE_DATA_GET(o, ptr); \
123 if (EINA_UNLIKELY(!ptr)) \ 123 if (EINA_UNLIKELY(!ptr)) \
124 { \ 124 { \
125 CRI("No widget data for object %p (%s)", \ 125 CRI("No widget data for object %p (%s)", \
@@ -127,8 +127,8 @@ struct _Elm_Image_Data
127 return val; \ 127 return val; \
128 } 128 }
129 129
130#define ELM_IMAGE_CHECK(obj) \ 130#define EFL_UI_IMAGE_CHECK(obj) \
131 if (EINA_UNLIKELY(!eo_isa((obj), ELM_IMAGE_CLASS))) \ 131 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_IMAGE_CLASS))) \
132 return 132 return
133 133
134#endif 134#endif
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 4b3b1a4205..23ad9a59fe 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -8,7 +8,7 @@
8 8
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_widget_icon.h" 10#include "elm_widget_icon.h"
11#include "elm_widget_image.h" 11#include "efl_ui_widget_image.h"
12 12
13#define NON_EXISTING (void *)-1 13#define NON_EXISTING (void *)-1
14 14
@@ -298,7 +298,7 @@ static void
298_edje_signals_free(Elm_Icon_Data *sd) 298_edje_signals_free(Elm_Icon_Data *sd)
299{ 299{
300 Edje_Signal_Data *esd; 300 Edje_Signal_Data *esd;
301 Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_IMAGE_CLASS); 301 Efl_Ui_Image_Data *id = eo_data_scope_get(sd->obj, EFL_UI_IMAGE_CLASS);
302 302
303 EINA_LIST_FREE(sd->edje_signals, esd) 303 EINA_LIST_FREE(sd->edje_signals, esd)
304 { 304 {
@@ -316,7 +316,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
316{ 316{
317 Evas_Object *pclip; 317 Evas_Object *pclip;
318 318
319 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); 319 Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
320 320
321 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); 321 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
322 322
@@ -527,7 +527,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
527 const char *source) 527 const char *source)
528{ 528{
529 529
530 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); 530 Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
531 531
532 if (!id->edje) return; 532 if (!id->edje) return;
533 533
@@ -545,7 +545,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj,
545 Edje_Signal_Data *esd; 545 Edje_Signal_Data *esd;
546 546
547 ELM_ICON_DATA_GET(obj, sd); 547 ELM_ICON_DATA_GET(obj, sd);
548 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); 548 Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
549 549
550 if (!id->edje) return; 550 if (!id->edje) return;
551 551
@@ -576,7 +576,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj,
576 Eina_List *l; 576 Eina_List *l;
577 577
578 ELM_ICON_DATA_GET(obj, sd); 578 ELM_ICON_DATA_GET(obj, sd);
579 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); 579 Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
580 580
581 if (!id->edje) return NULL; 581 if (!id->edje) return NULL;
582 582
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index 8cca5c5280..fe4daecc5f 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -6,7 +6,7 @@ enum Elm.Icon.Type
6 standard 6 standard
7} 7}
8 8
9class Elm.Icon (Elm.Image) 9class Elm.Icon (Efl.Ui.Image)
10{ 10{
11 legacy_prefix: elm_icon; 11 legacy_prefix: elm_icon;
12 eo_prefix: elm_obj_icon; 12 eo_prefix: elm_obj_icon;