summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWoochan Lee <wc0917.lee@samsung.com>2017-09-15 17:13:30 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 16:20:09 +0900
commit6c3bc915dfcc638c34ee3c242d80702407b2b5bf (patch)
tree3e4d115abcb6790a29b626f57f1f0ce22d8d0259
parent98f81f5cbf951464046dd0db34665b230b2b6c55 (diff)
elm: rename elm_multibuttonentry to Efl.Ui.Multibuttonentry
Summary: @ref T5358 Reviewers: woohyun, jpeg, cedric, Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: Jaehyun, bu5hm4n, cedric, jpeg Maniphest Tasks: T5358 Differential Revision: https://phab.enlightenment.org/D5169 JP's note: MBE currently has quite a few issues, probably related to focus handling. This needs to be fixed.
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/bin/elementary/test_multibuttonentry.c2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c (renamed from src/lib/elementary/elc_multibuttonentry.c)357
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.eo (renamed from src/lib/elementary/elm_multibuttonentry.eo)8
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.h69
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry_eo.h (renamed from src/lib/elementary/elc_multibuttonentry_eo.h)2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry_part.eo11
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry_private.h (renamed from src/lib/elementary/elm_widget_multibuttonentry.h)22
-rw-r--r--src/lib/elementary/elc_multibuttonentry.h2
-rw-r--r--src/lib/elementary/elc_multibuttonentry_common.h2
-rw-r--r--src/lib/elementary/elc_multibuttonentry_legacy.h2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_part.eo9
13 files changed, 296 insertions, 202 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 03b7038203..27588cc07e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -96,7 +96,7 @@ src/lib/elementary/elc_fileselector.c
96src/lib/elementary/elc_fileselector_button.c 96src/lib/elementary/elc_fileselector_button.c
97src/lib/elementary/elc_fileselector_entry.c 97src/lib/elementary/elc_fileselector_entry.c
98src/lib/elementary/elc_hoversel.c 98src/lib/elementary/elc_hoversel.c
99src/lib/elementary/elc_multibuttonentry.c 99src/lib/elementary/efl_ui_multibuttonentry.c
100src/lib/elementary/elc_naviframe.c 100src/lib/elementary/elc_naviframe.c
101src/lib/elementary/elc_player.c 101src/lib/elementary/elc_player.c
102src/lib/elementary/elc_popup.c 102src/lib/elementary/elc_popup.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index e7e5f97ddd..e9c10db80a 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -46,7 +46,7 @@ elm_public_eolian_files = \
46 lib/elementary/elm_map.eo \ 46 lib/elementary/elm_map.eo \
47 lib/elementary/elm_map_pan.eo \ 47 lib/elementary/elm_map_pan.eo \
48 lib/elementary/elm_menu.eo \ 48 lib/elementary/elm_menu.eo \
49 lib/elementary/elm_multibuttonentry.eo \ 49 lib/elementary/efl_ui_multibuttonentry.eo \
50 lib/elementary/elm_notify.eo \ 50 lib/elementary/elm_notify.eo \
51 lib/elementary/efl_ui_nstate.eo \ 51 lib/elementary/efl_ui_nstate.eo \
52 lib/elementary/elm_pan.eo \ 52 lib/elementary/elm_pan.eo \
@@ -122,7 +122,7 @@ elm_public_eolian_files = \
122 lib/elementary/elm_actionslider_part.eo \ 122 lib/elementary/elm_actionslider_part.eo \
123 lib/elementary/elm_bubble_part.eo \ 123 lib/elementary/elm_bubble_part.eo \
124 lib/elementary/elm_fileselector_part.eo \ 124 lib/elementary/elm_fileselector_part.eo \
125 lib/elementary/elm_multibuttonentry_part.eo \ 125 lib/elementary/efl_ui_multibuttonentry_part.eo \
126 lib/elementary/elm_code_widget.eo \ 126 lib/elementary/elm_code_widget.eo \
127 lib/elementary/efl_ui_text_interactive.eo \ 127 lib/elementary/efl_ui_text_interactive.eo \
128 lib/elementary/efl_ui_text.eo \ 128 lib/elementary/efl_ui_text.eo \
@@ -279,7 +279,7 @@ includesunstable_HEADERS = \
279 lib/elementary/elm_widget_map.h \ 279 lib/elementary/elm_widget_map.h \
280 lib/elementary/elm_widget_mapbuf.h \ 280 lib/elementary/elm_widget_mapbuf.h \
281 lib/elementary/elm_widget_menu.h \ 281 lib/elementary/elm_widget_menu.h \
282 lib/elementary/elm_widget_multibuttonentry.h \ 282 lib/elementary/efl_ui_multibuttonentry_private.h \
283 lib/elementary/elm_widget_naviframe.h \ 283 lib/elementary/elm_widget_naviframe.h \
284 lib/elementary/elm_widget_notify.h \ 284 lib/elementary/elm_widget_notify.h \
285 lib/elementary/elm_widget_panel.h \ 285 lib/elementary/elm_widget_panel.h \
@@ -339,7 +339,7 @@ includesub_HEADERS = \
339 lib/elementary/elc_hoversel.h \ 339 lib/elementary/elc_hoversel.h \
340 lib/elementary/elc_hoversel_legacy.h \ 340 lib/elementary/elc_hoversel_legacy.h \
341 lib/elementary/elc_multibuttonentry.h \ 341 lib/elementary/elc_multibuttonentry.h \
342 lib/elementary/elc_multibuttonentry_eo.h \ 342 lib/elementary/efl_ui_multibuttonentry_eo.h \
343 lib/elementary/elc_multibuttonentry_legacy.h \ 343 lib/elementary/elc_multibuttonentry_legacy.h \
344 lib/elementary/elc_multibuttonentry_common.h \ 344 lib/elementary/elc_multibuttonentry_common.h \
345 lib/elementary/elc_naviframe.h \ 345 lib/elementary/elc_naviframe.h \
@@ -570,7 +570,7 @@ lib_elementary_libelementary_la_SOURCES = \
570 lib/elementary/elc_fileselector_button.c \ 570 lib/elementary/elc_fileselector_button.c \
571 lib/elementary/elc_fileselector_entry.c \ 571 lib/elementary/elc_fileselector_entry.c \
572 lib/elementary/elc_hoversel.c \ 572 lib/elementary/elc_hoversel.c \
573 lib/elementary/elc_multibuttonentry.c \ 573 lib/elementary/efl_ui_multibuttonentry.c \
574 lib/elementary/elc_naviframe.c \ 574 lib/elementary/elc_naviframe.c \
575 lib/elementary/elc_player.c \ 575 lib/elementary/elc_player.c \
576 lib/elementary/elc_popup.c \ 576 lib/elementary/elc_popup.c \
diff --git a/src/bin/elementary/test_multibuttonentry.c b/src/bin/elementary/test_multibuttonentry.c
index e4c3370908..2d371416a1 100644
--- a/src/bin/elementary/test_multibuttonentry.c
+++ b/src/bin/elementary/test_multibuttonentry.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Elementary.h> 4#include <Elementary.h>
5 5
6static Elm_Multibuttonentry_Format_Cb format_func = NULL; 6static Efl_Ui_Multibuttonentry_Format_Cb format_func = NULL;
7 7
8static char * 8static char *
9_custom_format(int count, void *data EINA_UNUSED) 9_custom_format(int count, void *data EINA_UNUSED)
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index 019b96aa6a..0456532b63 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -9,14 +9,15 @@
9 9
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_widget_multibuttonentry.h" 12#include "efl_ui_multibuttonentry_private.h"
13 13
14#include "elm_multibuttonentry_part.eo.h" 14#include "efl_ui_multibuttonentry_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS 17#define MY_CLASS EFL_UI_MULTIBUTTONENTRY_CLASS
18#define MY_CLASS_PFX efl_ui_multibuttonentry
18 19
19#define MY_CLASS_NAME "Elm_Multibuttonentry" 20#define MY_CLASS_NAME "Efl.Ui.Multibuttonentry"
20#define MY_CLASS_NAME_LEGACY "elm_multibuttonentry" 21#define MY_CLASS_NAME_LEGACY "elm_multibuttonentry"
21 22
22#define MAX_STR 256 23#define MAX_STR 256
@@ -49,8 +50,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
49 {NULL, NULL} 50 {NULL, NULL}
50}; 51};
51 52
52static Eina_Bool _elm_multibuttonentry_smart_focus_next_enable = EINA_FALSE; 53static Eina_Bool _efl_ui_multibuttonentry_smart_focus_next_enable = EINA_FALSE;
53static Eina_Bool _elm_multibuttonentry_smart_focus_direction_enable = EINA_TRUE; 54static Eina_Bool _efl_ui_multibuttonentry_smart_focus_direction_enable = EINA_TRUE;
54 55
55static void _entry_changed_cb(void *data, const Efl_Event *event); 56static void _entry_changed_cb(void *data, const Efl_Event *event);
56static void _entry_focus_in_cb(void *data, const Efl_Event *event); 57static void _entry_focus_in_cb(void *data, const Efl_Event *event);
@@ -65,7 +66,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
65); 66);
66 67
67EOLIAN static void 68EOLIAN static void
68_elm_multibuttonentry_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 69_efl_ui_multibuttonentry_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
69{ 70{
70 Elm_Object_Item *it; 71 Elm_Object_Item *it;
71 Eina_List *l; 72 Eina_List *l;
@@ -86,7 +87,7 @@ _format_count(int count, void *data EINA_UNUSED)
86} 87}
87 88
88EOLIAN static Efl_Ui_Theme_Apply 89EOLIAN static Efl_Ui_Theme_Apply
89_elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) 90_efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
90{ 91{
91 const char *str; 92 const char *str;
92 int hpad = 0, vpad = 0; 93 int hpad = 0, vpad = 0;
@@ -133,7 +134,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
133static void 134static void
134_visual_guide_text_set(Evas_Object *obj) 135_visual_guide_text_set(Evas_Object *obj)
135{ 136{
136 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 137 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
137 138
138 elm_box_unpack(sd->box, sd->guide_text); 139 elm_box_unpack(sd->box, sd->guide_text);
139 elm_box_unpack(sd->box, sd->entry); 140 elm_box_unpack(sd->box, sd->entry);
@@ -176,8 +177,9 @@ _shrink_mode_set(Evas_Object *obj,
176 Eina_List *l; 177 Eina_List *l;
177 Elm_Object_Item *eo_item; 178 Elm_Object_Item *eo_item;
178 179
179 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 180 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
180 181
182 if (!sd->items) return;
181 if (sd->view_state == MULTIBUTTONENTRY_VIEW_ENTRY) 183 if (sd->view_state == MULTIBUTTONENTRY_VIEW_ENTRY)
182 evas_object_hide(sd->entry); 184 evas_object_hide(sd->entry);
183 else if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT) 185 else if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
@@ -205,7 +207,9 @@ _shrink_mode_set(Evas_Object *obj,
205 if (sd->label && sd->label_packed) 207 if (sd->label && sd->label_packed)
206 { 208 {
207 elm_box_pack_end(sd->box, sd->label); 209 elm_box_pack_end(sd->box, sd->label);
208 w -= efl_gfx_size_hint_combined_min_get(sd->label).w; 210 Eina_Size2D label_min =
211 efl_gfx_size_hint_combined_min_get(sd->label);
212 w -= label_min.w;
209 w -= box_inner_item_width_padding; 213 w -= box_inner_item_width_padding;
210 } 214 }
211 215
@@ -222,7 +226,10 @@ _shrink_mode_set(Evas_Object *obj,
222 evas_object_show(VIEW(item)); 226 evas_object_show(VIEW(item));
223 item->visible = EINA_TRUE; 227 item->visible = EINA_TRUE;
224 228
225 w -= efl_gfx_size_hint_combined_min_get(VIEW(item)).w; 229 Eina_Size2D item_min =
230 efl_gfx_size_hint_combined_min_get(VIEW(item));
231
232 w -= item_min.w;
226 w -= box_inner_item_width_padding; 233 w -= box_inner_item_width_padding;
227 count--; 234 count--;
228 235
@@ -270,7 +277,7 @@ _shrink_mode_set(Evas_Object *obj,
270 { 277 {
271 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK; 278 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
272 efl_event_callback_legacy_call 279 efl_event_callback_legacy_call
273 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1); 280 (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1);
274 } 281 }
275 } 282 }
276 else 283 else
@@ -303,36 +310,36 @@ _shrink_mode_set(Evas_Object *obj,
303 { 310 {
304 sd->view_state = MULTIBUTTONENTRY_VIEW_NONE; 311 sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
305 efl_event_callback_legacy_call 312 efl_event_callback_legacy_call
306 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink); 313 (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
307 } 314 }
308 } 315 }
309 316
310 if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) 317 if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
311 _elm_multibuttonentry_smart_focus_direction_enable = EINA_FALSE; 318 _efl_ui_multibuttonentry_smart_focus_direction_enable = EINA_FALSE;
312 else 319 else
313 _elm_multibuttonentry_smart_focus_direction_enable = EINA_TRUE; 320 _efl_ui_multibuttonentry_smart_focus_direction_enable = EINA_TRUE;
314 321
315 if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK) 322 if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK)
316 _visual_guide_text_set(obj); 323 _visual_guide_text_set(obj);
317} 324}
318 325
319static void 326static void
320_view_update(Elm_Multibuttonentry_Data *sd) 327_view_update(Efl_Ui_Multibuttonentry_Data *sd)
321{ 328{
322 Evas_Coord width = 1, height = 1; 329 Eina_Size2D min = { 1, 1 };
323 Evas_Object *obj = sd->parent; 330 Evas_Object *obj = sd->parent;
324 331
325 if (sd->w_box <= 0) return; 332 if (sd->w_box <= 0) return;
326 333
327 // update label 334 // update label
328 if (sd->label) 335 if (sd->label)
329 evas_object_size_hint_combined_min_get(sd->label, &width, &height); 336 min = efl_gfx_size_hint_combined_min_get(sd->label);
330 337
331 if (sd->guide_text) 338 if (sd->guide_text)
332 { 339 {
333 Evas_Coord guide_text_width = sd->w_box - width; 340 Evas_Coord guide_text_width = sd->w_box - min.w;
334 341
335 evas_object_size_hint_min_set(sd->guide_text, guide_text_width, height); 342 evas_object_size_hint_min_set(sd->guide_text, guide_text_width, min.h);
336 } 343 }
337 344
338 // update buttons in shrink mode 345 // update buttons in shrink mode
@@ -344,13 +351,10 @@ _view_update(Elm_Multibuttonentry_Data *sd)
344} 351}
345 352
346EOLIAN static Eina_Bool 353EOLIAN static Eina_Bool
347_elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *item EINA_UNUSED) 354_efl_ui_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
348{ 355{
349 if (elm_widget_focus_get(obj)) 356 if (elm_widget_focus_get(obj))
350 { 357 {
351 if (sd->focused) goto end;
352 sd->focused = EINA_TRUE;
353
354 // ACCESS 358 // ACCESS
355 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) goto end; 359 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) goto end;
356 360
@@ -360,27 +364,24 @@ _elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_D
360 { 364 {
361 elm_layout_signal_emit(VIEW(sd->selected_it), "elm,state,focused", "elm"); 365 elm_layout_signal_emit(VIEW(sd->selected_it), "elm,state,focused", "elm");
362 elm_object_focus_set(VIEW(sd->selected_it), EINA_TRUE); 366 elm_object_focus_set(VIEW(sd->selected_it), EINA_TRUE);
363 elm_entry_input_panel_show(sd->entry); 367 efl_ui_text_input_panel_show(sd->entry);
364 } 368 }
365 else if (((!sd->selected_it) || (!eina_list_count(sd->items)))) 369 else if (((!sd->selected_it) || (!eina_list_count(sd->items))))
366 { 370 {
367 elm_entry_cursor_end_set(sd->entry);
368 _view_update(sd); 371 _view_update(sd);
369 elm_entry_input_panel_show(sd->entry); 372 efl_ui_text_input_panel_show(sd->entry);
370 } 373 }
371 } 374 }
375
372 efl_event_callback_legacy_call 376 efl_event_callback_legacy_call
373 (obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL); 377 (obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
374 } 378 }
375 else 379 else
376 { 380 {
377 if (sd->focused) goto end;
378 sd->focused = EINA_FALSE;
379
380 if (sd->editable) 381 if (sd->editable)
381 { 382 {
382 _view_update(sd); 383 _view_update(sd);
383 elm_entry_input_panel_hide(sd->entry); 384 efl_ui_text_input_panel_hide(sd->entry);
384 } 385 }
385 386
386 if (sd->selected_it) 387 if (sd->selected_it)
@@ -399,13 +400,13 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
399{ 400{
400 Evas_Object *obj = WIDGET(item); 401 Evas_Object *obj = WIDGET(item);
401 402
402 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 403 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
403 404
404 sd->items = eina_list_remove(sd->items, EO_OBJ(item)); 405 sd->items = eina_list_remove(sd->items, EO_OBJ(item));
405 elm_box_unpack(sd->box, VIEW(item)); 406 elm_box_unpack(sd->box, VIEW(item));
406 407
407 efl_event_callback_legacy_call 408 efl_event_callback_legacy_call
408 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item)); 409 (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item));
409 410
410 if (sd->selected_it == item) 411 if (sd->selected_it == item)
411 sd->selected_it = NULL; 412 sd->selected_it = NULL;
@@ -426,7 +427,7 @@ _current_item_state_change(Evas_Object *obj,
426{ 427{
427 Elm_Multibuttonentry_Item_Data *item; 428 Elm_Multibuttonentry_Item_Data *item;
428 429
429 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 430 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
430 431
431 item = sd->selected_it; 432 item = sd->selected_it;
432 433
@@ -437,7 +438,7 @@ _current_item_state_change(Evas_Object *obj,
437 case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED: 438 case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
438 elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm"); 439 elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
439 efl_event_callback_legacy_call 440 efl_event_callback_legacy_call
440 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)); 441 (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item));
441 break; 442 break;
442 case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT: 443 case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
443 default: 444 default:
@@ -454,7 +455,7 @@ _current_item_change(Evas_Object *obj,
454 Eina_List *l; 455 Eina_List *l;
455 Elm_Object_Item *eo_temp_it; 456 Elm_Object_Item *eo_temp_it;
456 457
457 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 458 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
458 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it); 459 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it);
459 460
460 // change the state of previous item to "default" 461 // change the state of previous item to "default"
@@ -477,7 +478,7 @@ static void
477_item_select(Evas_Object *obj, 478_item_select(Evas_Object *obj,
478 Elm_Multibuttonentry_Item_Data *it) 479 Elm_Multibuttonentry_Item_Data *it)
479{ 480{
480 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 481 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
481 482
482 if (it) 483 if (it)
483 { 484 {
@@ -530,18 +531,18 @@ _on_item_clicked(void *data,
530 Elm_Object_Item *eo_it = data; 531 Elm_Object_Item *eo_it = data;
531 532
532 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it); 533 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it);
533 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 534 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
534 535
535 _item_select(WIDGET(it), it); 536 _item_select(WIDGET(it), it);
536 537
537 if (_elm_config->atspi_mode) 538 if (_elm_config->atspi_mode)
538 efl_access_state_changed_signal_emit(eo_it, 539 efl_access_state_changed_signal_emit(eo_it,
539 EFL_ACCESS_STATE_CHECKED, 540 EFL_ACCESS_STATE_CHECKED,
540 EINA_TRUE); 541 EINA_TRUE);
541 542
542 if (sd->selected_it) 543 if (sd->selected_it)
543 efl_event_callback_legacy_call 544 efl_event_callback_legacy_call
544 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it); 545 (WIDGET(it), EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it);
545} 546}
546 547
547static void 548static void
@@ -555,7 +556,7 @@ _on_item_deleted(void *data,
555 Elm_Object_Item *eo_temp_it; 556 Elm_Object_Item *eo_temp_it;
556 557
557 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it); 558 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_it, it);
558 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 559 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
559 // change the current 560 // change the current
560 EINA_LIST_FOREACH(sd->items, l, eo_temp_it) 561 EINA_LIST_FOREACH(sd->items, l, eo_temp_it)
561 { 562 {
@@ -576,7 +577,7 @@ _on_item_focused(void *data,
576 Elm_Multibuttonentry_Item_Data *it = data; 577 Elm_Multibuttonentry_Item_Data *it = data;
577 if (!it) return; 578 if (!it) return;
578 579
579 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 580 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
580 581
581 sd->focused_it = it; 582 sd->focused_it = it;
582} 583}
@@ -589,7 +590,7 @@ _on_item_unfocused(void *data,
589 Elm_Multibuttonentry_Item_Data *it = data; 590 Elm_Multibuttonentry_Item_Data *it = data;
590 if (!it) return; 591 if (!it) return;
591 592
592 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 593 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
593 594
594 sd->focused_it = NULL; 595 sd->focused_it = NULL;
595} 596}
@@ -599,12 +600,12 @@ _long_press_cb(void *data)
599{ 600{
600 Elm_Multibuttonentry_Item_Data *it = data; 601 Elm_Multibuttonentry_Item_Data *it = data;
601 602
602 ELM_MULTIBUTTONENTRY_DATA_GET(WIDGET(it), sd); 603 EFL_UI_MULTIBUTTONENTRY_DATA_GET(WIDGET(it), sd);
603 604
604 sd->longpress_timer = NULL; 605 sd->longpress_timer = NULL;
605 606
606 efl_event_callback_legacy_call 607 efl_event_callback_legacy_call
607 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it)); 608 (WIDGET(it), EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it));
608 609
609 return ECORE_CALLBACK_CANCEL; 610 return ECORE_CALLBACK_CANCEL;
610} 611}
@@ -618,7 +619,7 @@ _mouse_down_cb(void *data,
618 Elm_Multibuttonentry_Item_Data *it = data; 619 Elm_Multibuttonentry_Item_Data *it = data;
619 Evas_Event_Mouse_Down *ev = event_info; 620 Evas_Event_Mouse_Down *ev = event_info;
620 621
621 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 622 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
622 623
623 if (ev->button != 1) return; 624 if (ev->button != 1) return;
624 625
@@ -635,7 +636,7 @@ _mouse_up_cb(void *data,
635{ 636{
636 Elm_Multibuttonentry_Item_Data *it = data; 637 Elm_Multibuttonentry_Item_Data *it = data;
637 638
638 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd); 639 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(it), sd);
639 640
640 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); 641 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
641} 642}
@@ -657,7 +658,7 @@ _elm_multibuttonentry_item_elm_widget_item_part_text_set(Eo *eo_item EINA_UNUSED
657{ 658{
658 const char *dest_part = NULL; 659 const char *dest_part = NULL;
659 Evas_Coord minw = -1, minh = -1, boxw; 660 Evas_Coord minw = -1, minh = -1, boxw;
660 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(item), sd); 661 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(WIDGET(item), sd);
661 662
662 if (!part || !strcmp(part, "elm.text")) 663 if (!part || !strcmp(part, "elm.text"))
663 dest_part = "elm.btn.text"; 664 dest_part = "elm.btn.text";
@@ -708,7 +709,7 @@ _elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it,
708static void 709static void
709_access_multibuttonentry_label_register(Evas_Object *obj, Eina_Bool is_access) 710_access_multibuttonentry_label_register(Evas_Object *obj, Eina_Bool is_access)
710{ 711{
711 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 712 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
712 Evas_Object *po; 713 Evas_Object *po;
713 714
714 po = (Evas_Object *)edje_object_part_object_get(sd->label, "elm.text"); 715 po = (Evas_Object *)edje_object_part_object_get(sd->label, "elm.text");
@@ -762,7 +763,7 @@ _elm_multibuttonentry_item_efl_object_constructor(Eo *eo_item, Elm_Multibuttonen
762} 763}
763 764
764static Elm_Object_Item * 765static Elm_Object_Item *
765_item_new(Elm_Multibuttonentry_Data *sd, 766_item_new(Efl_Ui_Multibuttonentry_Data *sd,
766 const char *str, 767 const char *str,
767 Multibuttonentry_Pos pos, 768 Multibuttonentry_Pos pos,
768 Elm_Object_Item *efl_reference, 769 Elm_Object_Item *efl_reference,
@@ -776,7 +777,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
776 efl_data_scope_get(efl_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS): 777 efl_data_scope_get(efl_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS):
777 NULL; 778 NULL;
778 Evas_Object *obj; 779 Evas_Object *obj;
779 int minw, minh, boxw; 780 Eina_Size2D min;
781 Evas_Coord boxw;
780 782
781 obj = sd->parent; 783 obj = sd->parent;
782 784
@@ -807,7 +809,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
807 elm_object_part_text_set(VIEW(item), "elm.btn.text", str); 809 elm_object_part_text_set(VIEW(item), "elm.btn.text", str);
808 810
809 //entry is cleared when text is made to button 811 //entry is cleared when text is made to button
810 elm_object_text_set(sd->entry, ""); 812 efl_text_set(sd->entry, "");
811 813
812 elm_layout_signal_callback_add 814 elm_layout_signal_callback_add
813 (VIEW(item), "mouse,clicked,1", "*", _on_item_clicked, EO_OBJ(item)); 815 (VIEW(item), "mouse,clicked,1", "*", _on_item_clicked, EO_OBJ(item));
@@ -827,14 +829,14 @@ _item_new(Elm_Multibuttonentry_Data *sd,
827 evas_object_show(VIEW(item)); 829 evas_object_show(VIEW(item));
828 830
829 evas_object_smart_calculate(VIEW(item)); 831 evas_object_smart_calculate(VIEW(item));
830 evas_object_size_hint_combined_min_get(VIEW(item), &minw, &minh); 832 min = efl_gfx_size_hint_combined_min_get(VIEW(item));
831 evas_object_geometry_get(sd->box, NULL, NULL, &boxw, NULL); 833 evas_object_geometry_get(sd->box, NULL, NULL, &boxw, NULL);
832 834
833 if (sd->w_box && minw > boxw) 835 if (sd->w_box && min.w > boxw)
834 { 836 {
835 elm_coords_finger_size_adjust(1, &boxw, 1, &minh); 837 elm_coords_finger_size_adjust(1, &boxw, 1, &min.h);
836 evas_object_size_hint_min_set(VIEW(item), boxw, minh); 838 evas_object_size_hint_min_set(VIEW(item), boxw, min.h);
837 evas_object_resize(VIEW(item), boxw, minh); 839 evas_object_resize(VIEW(item), boxw, min.h);
838 } 840 }
839 841
840 elm_object_focus_allow_set(VIEW(item), EINA_TRUE); 842 elm_object_focus_allow_set(VIEW(item), EINA_TRUE);
@@ -921,9 +923,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
921 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT) 923 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
922 _visual_guide_text_set(obj); 924 _visual_guide_text_set(obj);
923 if (sd->editable) 925 if (sd->editable)
924 { 926 elm_box_pack_before(sd->box, VIEW(item), sd->entry);
925 elm_box_pack_before(sd->box, VIEW(item), sd->entry);
926 }
927 else 927 else
928 elm_box_pack_end(sd->box, VIEW(item)); 928 elm_box_pack_end(sd->box, VIEW(item));
929 } 929 }
@@ -949,9 +949,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
949 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT) 949 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
950 _visual_guide_text_set(obj); 950 _visual_guide_text_set(obj);
951 if (sd->editable) 951 if (sd->editable)
952 { 952 elm_box_pack_before(sd->box, VIEW(item), sd->entry);
953 elm_box_pack_before(sd->box, VIEW(item), sd->entry);
954 }
955 else 953 else
956 elm_box_pack_end(sd->box, VIEW(item)); 954 elm_box_pack_end(sd->box, VIEW(item));
957 } 955 }
@@ -967,7 +965,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
967 965
968 966
969 efl_event_callback_legacy_call 967 efl_event_callback_legacy_call
970 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item); 968 (obj, EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item);
971 969
972 if (_elm_config->atspi_mode) 970 if (_elm_config->atspi_mode)
973 { 971 {
@@ -981,7 +979,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
981//FIXME: having an empty event handling function and reacting on Evas 979//FIXME: having an empty event handling function and reacting on Evas
982//events on specific objects is crazy, someone should fix that. 980//events on specific objects is crazy, someone should fix that.
983EOLIAN static Eina_Bool 981EOLIAN static Eina_Bool
984_elm_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED) 982_efl_ui_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED)
985{ 983{
986 // ACCESS 984 // ACCESS
987 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE; 985 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE;
@@ -990,7 +988,7 @@ _elm_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Multibutt
990} 988}
991 989
992EOLIAN static void 990EOLIAN static void
993_elm_multibuttonentry_elm_layout_sizing_eval(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) 991_efl_ui_multibuttonentry_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED)
994{ 992{
995 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; 993 Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
996 994
@@ -1010,9 +1008,9 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
1010 const char *emission EINA_UNUSED, 1008 const char *emission EINA_UNUSED,
1011 const char *source EINA_UNUSED) 1009 const char *source EINA_UNUSED)
1012{ 1010{
1013 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 1011 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
1014 1012
1015 if (sd->editable) elm_entry_input_panel_show(sd->entry); 1013 if (sd->editable) efl_ui_text_input_panel_show(sd->entry);
1016 1014
1017 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL); 1015 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
1018} 1016}
@@ -1023,12 +1021,13 @@ _box_resize_cb(void *data,
1023 Evas_Object *obj EINA_UNUSED, 1021 Evas_Object *obj EINA_UNUSED,
1024 void *event EINA_UNUSED) 1022 void *event EINA_UNUSED)
1025{ 1023{
1026 Evas_Coord w, h, mnw, mnh; 1024 Evas_Coord w, h;
1025 Eina_Size2D min;
1027 Eina_List *l; 1026 Eina_List *l;
1028 Elm_Object_Item *eo_it; 1027 Elm_Object_Item *eo_it;
1029 int hpad; 1028 int hpad;
1030 1029
1031 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1030 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1032 1031
1033 evas_object_geometry_get(sd->box, NULL, NULL, &w, &h); 1032 evas_object_geometry_get(sd->box, NULL, NULL, &w, &h);
1034 if ((w <= elm_config_finger_size_get()) || (h <= elm_config_finger_size_get())) return; 1033 if ((w <= elm_config_finger_size_get()) || (h <= elm_config_finger_size_get())) return;
@@ -1037,10 +1036,10 @@ _box_resize_cb(void *data,
1037 1036
1038 if (sd->h_box < h) 1037 if (sd->h_box < h)
1039 efl_event_callback_legacy_call 1038 efl_event_callback_legacy_call
1040 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL); 1039 (sd->parent, EFL_UI_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL);
1041 else if (sd->h_box > h) 1040 else if (sd->h_box > h)
1042 efl_event_callback_legacy_call 1041 efl_event_callback_legacy_call
1043 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL); 1042 (sd->parent, EFL_UI_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL);
1044 1043
1045 if (sd->items && sd->w_box != w) 1044 if (sd->items && sd->w_box != w)
1046 { 1045 {
@@ -1051,13 +1050,13 @@ _box_resize_cb(void *data,
1051 elm_layout_sizing_eval(VIEW(it)); 1050 elm_layout_sizing_eval(VIEW(it));
1052 evas_object_smart_calculate(VIEW(it)); 1051 evas_object_smart_calculate(VIEW(it));
1053 1052
1054 evas_object_size_hint_combined_min_get(VIEW(it), &mnw, &mnh); 1053 min = efl_gfx_size_hint_combined_min_get(VIEW(it));
1055 1054
1056 if (mnw > w - hpad) 1055 if (min.w > w - hpad)
1057 { 1056 {
1058 mnw = w - hpad; 1057 min.w = w - hpad;
1059 evas_object_size_hint_min_set(VIEW(it), mnw, mnh); 1058 evas_object_size_hint_min_set(VIEW(it), min.w, min.h);
1060 evas_object_resize(VIEW(it), mnw, mnh); 1059 evas_object_resize(VIEW(it), min.w, min.h);
1061 } 1060 }
1062 } 1061 }
1063 } 1062 }
@@ -1075,7 +1074,7 @@ _entry_resize_cb(void *data,
1075 Evas_Object *obj EINA_UNUSED, 1074 Evas_Object *obj EINA_UNUSED,
1076 void *event_info EINA_UNUSED) 1075 void *event_info EINA_UNUSED)
1077{ 1076{
1078 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1077 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1079 1078
1080 if (elm_widget_focus_get(sd->parent)) 1079 if (elm_widget_focus_get(sd->parent))
1081 elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE); 1080 elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE);
@@ -1084,10 +1083,10 @@ _entry_resize_cb(void *data,
1084static void 1083static void
1085_entry_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) 1084_entry_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
1086{ 1085{
1087 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1086 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1088 const char *str; 1087 const char *str;
1089 1088
1090 str = elm_object_text_get(sd->entry); 1089 str = efl_text_get(sd->entry);
1091 sd->n_str = str ? strlen(str) : 0; 1090 sd->n_str = str ? strlen(str) : 0;
1092} 1091}
1093 1092
@@ -1095,7 +1094,7 @@ static void
1095_entry_focus_in_cb(void *data, const Efl_Event *event EINA_UNUSED) 1094_entry_focus_in_cb(void *data, const Efl_Event *event EINA_UNUSED)
1096{ 1095{
1097 Elm_Multibuttonentry_Item_Data *item = NULL; 1096 Elm_Multibuttonentry_Item_Data *item = NULL;
1098 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1097 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1099 1098
1100 if (sd->selected_it) 1099 if (sd->selected_it)
1101 { 1100 {
@@ -1108,10 +1107,10 @@ _entry_focus_in_cb(void *data, const Efl_Event *event EINA_UNUSED)
1108static void 1107static void
1109_entry_focus_out_cb(void *data, const Efl_Event *event EINA_UNUSED) 1108_entry_focus_out_cb(void *data, const Efl_Event *event EINA_UNUSED)
1110{ 1109{
1111 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1110 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1112 const char *str; 1111 const char *str;
1113 1112
1114 str = elm_object_text_get(sd->entry); 1113 str = efl_text_get(sd->entry);
1115 if (str && str[0]) 1114 if (str && str[0])
1116 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL); 1115 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
1117} 1116}
@@ -1119,7 +1118,7 @@ _entry_focus_out_cb(void *data, const Efl_Event *event EINA_UNUSED)
1119static void 1118static void
1120_entry_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) 1119_entry_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
1121{ 1120{
1122 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1121 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1123 1122
1124 _current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT); 1123 _current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
1125 elm_object_focus_set(sd->entry, EINA_TRUE); 1124 elm_object_focus_set(sd->entry, EINA_TRUE);
@@ -1131,7 +1130,7 @@ _layout_key_down_cb(void *data,
1131 Evas_Object *obj EINA_UNUSED, 1130 Evas_Object *obj EINA_UNUSED,
1132 void *event_info) 1131 void *event_info)
1133{ 1132{
1134 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1133 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1135 Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info; 1134 Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info;
1136 1135
1137 if (!sd->box) return; 1136 if (!sd->box) return;
@@ -1179,7 +1178,7 @@ _entry_key_down_cb(void *data,
1179 Evas_Object *obj EINA_UNUSED, 1178 Evas_Object *obj EINA_UNUSED,
1180 void *event_info) 1179 void *event_info)
1181{ 1180{
1182 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1181 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1183 Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info; 1182 Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info;
1184 1183
1185 if (sd->n_str == 1 && 1184 if (sd->n_str == 1 &&
@@ -1193,13 +1192,13 @@ _entry_key_up_cb(void *data,
1193 Evas_Object *obj EINA_UNUSED, 1192 Evas_Object *obj EINA_UNUSED,
1194 void *event_info) 1193 void *event_info)
1195{ 1194{
1196 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1195 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1197 Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info; 1196 Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info;
1198 const char *str; 1197 const char *str;
1199 1198
1200 if (!sd->box) return; 1199 if (!sd->box) return;
1201 1200
1202 str = elm_object_text_get(sd->entry); 1201 str = efl_text_get(sd->entry);
1203 if (!str) return; 1202 if (!str) return;
1204 1203
1205 if (strlen(str) && 1204 if (strlen(str) &&
@@ -1213,7 +1212,7 @@ _entry_key_up_cb(void *data,
1213static void 1212static void
1214_callbacks_register(Evas_Object *obj) 1213_callbacks_register(Evas_Object *obj)
1215{ 1214{
1216 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 1215 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
1217 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1216 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1218 1217
1219 elm_layout_signal_callback_add 1218 elm_layout_signal_callback_add
@@ -1241,7 +1240,7 @@ _label_set(Evas_Object *obj,
1241{ 1240{
1242 Evas_Coord width, height; 1241 Evas_Coord width, height;
1243 1242
1244 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 1243 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
1245 1244
1246 if (!str) return; 1245 if (!str) return;
1247 1246
@@ -1273,7 +1272,7 @@ static void
1273_guide_text_set(Evas_Object *obj, 1272_guide_text_set(Evas_Object *obj,
1274 const char *str) 1273 const char *str)
1275{ 1274{
1276 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 1275 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
1277 1276
1278 if (!str) return; 1277 if (!str) return;
1279 1278
@@ -1320,36 +1319,38 @@ _box_min_size_calculate(Evas_Object *box,
1320 int *line_height, 1319 int *line_height,
1321 void *data EINA_UNUSED) 1320 void *data EINA_UNUSED)
1322{ 1321{
1323 Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0; 1322 Evas_Coord w, linew = 0, lineh = 0;
1323 Eina_Size2D box_min;
1324 Eina_Size2D min;
1324 int line_num; 1325 int line_num;
1325 Eina_List *l; 1326 Eina_List *l;
1326 Evas_Object_Box_Option *opt; 1327 Evas_Object_Box_Option *opt;
1327 1328
1328 evas_object_geometry_get(box, NULL, NULL, &w, NULL); 1329 evas_object_geometry_get(box, NULL, NULL, &w, NULL);
1329 evas_object_size_hint_combined_min_get(box, &minw, NULL); 1330 box_min = efl_gfx_size_hint_combined_min_get(box);
1330 1331
1331 if (!w) return EINA_FALSE; 1332 if (!w) return EINA_FALSE;
1332 1333
1333 line_num = 1; 1334 line_num = 1;
1334 EINA_LIST_FOREACH(priv->children, l, opt) 1335 EINA_LIST_FOREACH(priv->children, l, opt)
1335 { 1336 {
1336 evas_object_size_hint_combined_min_get(opt->obj, &mnw, &mnh); 1337 min = efl_gfx_size_hint_combined_min_get(opt->obj);
1337 1338
1338 linew += mnw; 1339 linew += min.w;
1339 if (lineh < mnh) lineh = mnh; 1340 if (lineh < min.h) lineh = min.h;
1340 1341
1341 if (linew > w) 1342 if (linew > w)
1342 { 1343 {
1343 linew = mnw; 1344 linew = min.w;
1344 line_num++; 1345 line_num++;
1345 } 1346 }
1346 1347
1347 if ((linew != 0) && (l != eina_list_last(priv->children))) 1348 if ((linew != 0) && (l != eina_list_last(priv->children)))
1348 linew += priv->pad.h; 1349 linew += priv->pad.h;
1349 } 1350 }
1350 minh = lineh * line_num + (line_num - 1) * priv->pad.v; 1351 box_min.h = lineh * line_num + (line_num - 1) * priv->pad.v;
1351 1352
1352 evas_object_size_hint_min_set(box, minw, minh); 1353 evas_object_size_hint_min_set(box, box_min.w, box_min.h);
1353 *line_height = lineh; 1354 *line_height = lineh;
1354 1355
1355 return EINA_TRUE; 1356 return EINA_TRUE;
@@ -1361,7 +1362,8 @@ _box_layout_cb(Evas_Object *o,
1361 void *data) 1362 void *data)
1362{ 1363{
1363 Evas_Coord x, y, w, h, xx, yy; 1364 Evas_Coord x, y, w, h, xx, yy;
1364 Evas_Coord minw, minh, linew = 0, lineh = 0; 1365 Evas_Coord linew = 0, lineh = 0;
1366 Eina_Size2D min;
1365 Evas_Object_Box_Option *opt; 1367 Evas_Object_Box_Option *opt;
1366 const Eina_List *l, *l_next; 1368 const Eina_List *l, *l_next;
1367 Evas_Object *obj; 1369 Evas_Object *obj;
@@ -1372,21 +1374,21 @@ _box_layout_cb(Evas_Object *o,
1372 1374
1373 evas_object_geometry_get(o, &x, &y, &w, &h); 1375 evas_object_geometry_get(o, &x, &y, &w, &h);
1374 1376
1375 evas_object_size_hint_combined_min_get(o, &minw, &minh); 1377 min = efl_gfx_size_hint_combined_min_get(o);
1376 evas_object_size_hint_align_get(o, &ax, &ay); 1378 evas_object_size_hint_align_get(o, &ax, &ay);
1377 1379
1378 rtl = efl_ui_mirrored_get(data); 1380 rtl = efl_ui_mirrored_get(data);
1379 if (rtl) ax = 1.0 - ax; 1381 if (rtl) ax = 1.0 - ax;
1380 1382
1381 if (w < minw) 1383 if (w < min.w)
1382 { 1384 {
1383 x = x + ((w - minw) * (1.0 - ax)); 1385 x = x + ((w - min.w) * (1.0 - ax));
1384 w = minw; 1386 w = min.w;
1385 } 1387 }
1386 if (h < minh) 1388 if (h < min.h)
1387 { 1389 {
1388 y = y + ((h - minh) * (1.0 - ay)); 1390 y = y + ((h - min.h) * (1.0 - ay));
1389 h = minh; 1391 h = min.h;
1390 } 1392 }
1391 1393
1392 xx = x; 1394 xx = x;
@@ -1394,7 +1396,7 @@ _box_layout_cb(Evas_Object *o,
1394 1396
1395 EINA_LIST_FOREACH_SAFE(priv->children, l, l_next, opt) 1397 EINA_LIST_FOREACH_SAFE(priv->children, l, l_next, opt)
1396 { 1398 {
1397 Evas_Coord mnw, mnh; 1399 Eina_Size2D obj_min;
1398 Evas_Coord ww, hh, ow, oh; 1400 Evas_Coord ww, hh, ow, oh;
1399 double wx, wy; 1401 double wx, wy;
1400 int fw, fh; 1402 int fw, fh;
@@ -1402,14 +1404,14 @@ _box_layout_cb(Evas_Object *o,
1402 obj = opt->obj; 1404 obj = opt->obj;
1403 evas_object_size_hint_align_get(obj, &ax, &ay); 1405 evas_object_size_hint_align_get(obj, &ax, &ay);
1404 evas_object_size_hint_weight_get(obj, &wx, &wy); 1406 evas_object_size_hint_weight_get(obj, &wx, &wy);
1405 evas_object_size_hint_combined_min_get(obj, &mnw, &mnh); 1407 obj_min = efl_gfx_size_hint_combined_min_get(obj);
1406 1408
1407 fw = fh = EINA_FALSE; 1409 fw = fh = EINA_FALSE;
1408 if (EINA_DBL_EQ(ax, -1)) {fw = 1; ax = 0.5; } 1410 if (EINA_DBL_EQ(ax, -1)) {fw = 1; ax = 0.5; }
1409 if (EINA_DBL_EQ(ay, -1)) {fh = 1; ay = 0.5; } 1411 if (EINA_DBL_EQ(ay, -1)) {fh = 1; ay = 0.5; }
1410 if (rtl) ax = 1.0 - ax; 1412 if (rtl) ax = 1.0 - ax;
1411 1413
1412 ww = mnw; 1414 ww = obj_min.w;
1413 if (!EINA_DBL_EQ(wx, 0)) 1415 if (!EINA_DBL_EQ(wx, 0))
1414 { 1416 {
1415 if (ww <= w - linew) ww = w - linew; 1417 if (ww <= w - linew) ww = w - linew;
@@ -1417,9 +1419,9 @@ _box_layout_cb(Evas_Object *o,
1417 } 1419 }
1418 hh = lineh; 1420 hh = lineh;
1419 1421
1420 ow = mnw; 1422 ow = obj_min.w;
1421 if (fw) ow = ww; 1423 if (fw) ow = ww;
1422 oh = mnh; 1424 oh = obj_min.h;
1423 if (fh) oh = hh; 1425 if (fh) oh = hh;
1424 1426
1425 linew += ww; 1427 linew += ww;
@@ -1457,7 +1459,7 @@ _box_layout_cb(Evas_Object *o,
1457} 1459}
1458 1460
1459static void 1461static void
1460_view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) 1462_view_init(Evas_Object *obj, Efl_Ui_Multibuttonentry_Data *sd)
1461{ 1463{
1462 const char *str; 1464 const char *str;
1463 double pad_scale; 1465 double pad_scale;
@@ -1489,18 +1491,20 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd)
1489 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 1491 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
1490 _access_multibuttonentry_label_register(obj, EINA_TRUE); 1492 _access_multibuttonentry_label_register(obj, EINA_TRUE);
1491 1493
1492 sd->entry = elm_entry_add(obj); 1494 sd->entry = efl_add(EFL_UI_TEXT_CLASS, sd->box,
1493 if (!sd->entry) return; 1495 efl_text_multiline_set(efl_added, EINA_FALSE),
1494 elm_entry_single_line_set(sd->entry, EINA_TRUE); 1496 efl_text_set(efl_added, ""),
1495 elm_entry_cnp_mode_set(sd->entry, ELM_CNP_MODE_PLAINTEXT); 1497 efl_ui_text_cnp_mode_set(efl_added, EINA_FALSE),
1496 elm_object_text_set(sd->entry, ""); 1498 efl_ui_text_input_panel_enabled_set(efl_added, EINA_FALSE),
1497 elm_entry_input_panel_enabled_set(sd->entry, EINA_FALSE); 1499 efl_ui_text_interactive_editable_set(efl_added, EINA_TRUE),
1500 efl_composite_attach(obj, efl_added));
1501
1498 evas_object_size_hint_min_set(sd->entry, MIN_W_ENTRY, 0); 1502 evas_object_size_hint_min_set(sd->entry, MIN_W_ENTRY, 0);
1499 evas_object_size_hint_weight_set 1503 evas_object_size_hint_weight_set
1500 (sd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1504 (sd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1501 evas_object_size_hint_align_set(sd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); 1505 evas_object_size_hint_align_set(sd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
1506
1502 elm_box_pack_end(sd->box, sd->entry); 1507 elm_box_pack_end(sd->box, sd->entry);
1503 evas_object_show(sd->entry);
1504 1508
1505 sd->view_state = MULTIBUTTONENTRY_VIEW_ENTRY; 1509 sd->view_state = MULTIBUTTONENTRY_VIEW_ENTRY;
1506 1510
@@ -1520,8 +1524,26 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd)
1520 } 1524 }
1521} 1525}
1522 1526
1527static Eina_Bool
1528_efl_ui_multibuttonentry_content_set(Eo *obj, Efl_Ui_Multibuttonentry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
1529{
1530 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
1531}
1532
1533static Eo*
1534_efl_ui_multibuttonentry_content_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *_pd EINA_UNUSED, const char *part)
1535{
1536 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
1537}
1538
1539static Eo*
1540_efl_ui_multibuttonentry_content_unset(Eo *obj, Efl_Ui_Multibuttonentry_Data *_pd EINA_UNUSED, const char *part)
1541{
1542 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
1543}
1544
1523EOLIAN static Eina_Bool 1545EOLIAN static Eina_Bool
1524_elm_multibuttonentry_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED, const char *part, const char *label) 1546_efl_ui_multibuttonentry_text_set(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const char *part, const char *label)
1525{ 1547{
1526 Eina_Bool int_ret = EINA_TRUE; 1548 Eina_Bool int_ret = EINA_TRUE;
1527 1549
@@ -1542,7 +1564,7 @@ _elm_multibuttonentry_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSE
1542} 1564}
1543 1565
1544EOLIAN static const char* 1566EOLIAN static const char*
1545_elm_multibuttonentry_text_get(Eo *obj, Elm_Multibuttonentry_Data *sd, const char *part) 1567_efl_ui_multibuttonentry_text_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd, const char *part)
1546{ 1568{
1547 const char *text = NULL; 1569 const char *text = NULL;
1548 1570
@@ -1568,7 +1590,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
1568 Eina_List *l = NULL; 1590 Eina_List *l = NULL;
1569 Elm_Object_Item *eo_item; 1591 Elm_Object_Item *eo_item;
1570 1592
1571 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, NULL); 1593 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, NULL);
1572 1594
1573 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT) 1595 if (sd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
1574 { 1596 {
@@ -1600,7 +1622,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
1600} 1622}
1601 1623
1602EOLIAN static void 1624EOLIAN static void
1603_elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_Data *priv) 1625_efl_ui_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Multibuttonentry_Data *priv)
1604{ 1626{
1605 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1627 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1606 1628
@@ -1630,7 +1652,7 @@ _elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_D
1630} 1652}
1631 1653
1632EOLIAN static void 1654EOLIAN static void
1633_elm_multibuttonentry_efl_canvas_group_group_del(Eo *obj, Elm_Multibuttonentry_Data *sd) 1655_efl_ui_multibuttonentry_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
1634{ 1656{
1635 Eina_List *l; 1657 Eina_List *l;
1636 Elm_Object_Item *eo_item; 1658 Elm_Object_Item *eo_item;
@@ -1664,7 +1686,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
1664 Eina_List *l; 1686 Eina_List *l;
1665 Elm_Object_Item *it; 1687 Elm_Object_Item *it;
1666 1688
1667 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 1689 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
1668 1690
1669 /* label */ 1691 /* label */
1670 _access_multibuttonentry_label_register(obj, is_access); 1692 _access_multibuttonentry_label_register(obj, is_access);
@@ -1675,10 +1697,10 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
1675} 1697}
1676 1698
1677EOLIAN static void 1699EOLIAN static void
1678_elm_multibuttonentry_elm_widget_on_access_update(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) 1700_efl_ui_multibuttonentry_elm_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs)
1679{ 1701{
1680 _elm_multibuttonentry_smart_focus_next_enable = acs; 1702 _efl_ui_multibuttonentry_smart_focus_next_enable = acs;
1681 _access_obj_process(obj, _elm_multibuttonentry_smart_focus_next_enable); 1703 _access_obj_process(obj, _efl_ui_multibuttonentry_smart_focus_next_enable);
1682} 1704}
1683 1705
1684EAPI Evas_Object * 1706EAPI Evas_Object *
@@ -1689,7 +1711,7 @@ elm_multibuttonentry_add(Evas_Object *parent)
1689} 1711}
1690 1712
1691EOLIAN static Eo * 1713EOLIAN static Eo *
1692_elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) 1714_efl_ui_multibuttonentry_efl_object_constructor(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED)
1693{ 1715{
1694 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1716 obj = efl_constructor(efl_super(obj, MY_CLASS));
1695 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1717 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -1700,20 +1722,20 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data
1700} 1722}
1701 1723
1702EOLIAN static Evas_Object* 1724EOLIAN static Evas_Object*
1703_elm_multibuttonentry_entry_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1725_efl_ui_multibuttonentry_entry_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1704{ 1726{
1705 return sd->entry; 1727 return sd->entry;
1706} 1728}
1707 1729
1708EOLIAN static Eina_Bool 1730EOLIAN static Eina_Bool
1709_elm_multibuttonentry_expanded_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1731_efl_ui_multibuttonentry_expanded_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1710{ 1732{
1711 return sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ? 1733 return sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ?
1712 EINA_FALSE : EINA_TRUE; 1734 EINA_FALSE : EINA_TRUE;
1713} 1735}
1714 1736
1715EOLIAN static void 1737EOLIAN static void
1716_elm_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Format_Cb f_func, const void *data) 1738_efl_ui_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Efl_Ui_Multibuttonentry_Format_Cb f_func, const void *data)
1717{ 1739{
1718 sd->format_func = f_func; 1740 sd->format_func = f_func;
1719 if (!sd->format_func) sd->format_func = _format_count; 1741 if (!sd->format_func) sd->format_func = _format_count;
@@ -1724,7 +1746,7 @@ _elm_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Elm_Multibuttonen
1724} 1746}
1725 1747
1726EOLIAN static void 1748EOLIAN static void
1727_elm_multibuttonentry_expanded_set(Eo *obj, Elm_Multibuttonentry_Data *sd, Eina_Bool expanded) 1749_efl_ui_multibuttonentry_expanded_set(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd, Eina_Bool expanded)
1728{ 1750{
1729 if (((sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) ? 1751 if (((sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) ?
1730 EINA_FALSE : EINA_TRUE) == expanded) return; 1752 EINA_FALSE : EINA_TRUE) == expanded) return;
@@ -1736,7 +1758,7 @@ _elm_multibuttonentry_expanded_set(Eo *obj, Elm_Multibuttonentry_Data *sd, Eina_
1736} 1758}
1737 1759
1738EOLIAN static void 1760EOLIAN static void
1739_elm_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Eina_Bool editable) 1761_efl_ui_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Eina_Bool editable)
1740{ 1762{
1741 editable = !!editable; 1763 editable = !!editable;
1742 if (sd->editable == editable) return; 1764 if (sd->editable == editable) return;
@@ -1755,55 +1777,55 @@ _elm_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Dat
1755} 1777}
1756 1778
1757EOLIAN static Eina_Bool 1779EOLIAN static Eina_Bool
1758_elm_multibuttonentry_editable_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1780_efl_ui_multibuttonentry_editable_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1759{ 1781{
1760 return sd->editable; 1782 return sd->editable;
1761} 1783}
1762 1784
1763EOLIAN static Elm_Object_Item* 1785EOLIAN static Elm_Object_Item*
1764_elm_multibuttonentry_item_prepend(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) 1786_efl_ui_multibuttonentry_item_prepend(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data)
1765{ 1787{
1766 return _item_new(sd, label, MULTIBUTTONENTRY_POS_START, NULL, func, data); 1788 return _item_new(sd, label, MULTIBUTTONENTRY_POS_START, NULL, func, data);
1767} 1789}
1768 1790
1769EOLIAN static Elm_Object_Item* 1791EOLIAN static Elm_Object_Item*
1770_elm_multibuttonentry_item_append(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) 1792_efl_ui_multibuttonentry_item_append(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data)
1771{ 1793{
1772 return _item_new(sd, label, MULTIBUTTONENTRY_POS_END, NULL, func, data); 1794 return _item_new(sd, label, MULTIBUTTONENTRY_POS_END, NULL, func, data);
1773} 1795}
1774 1796
1775EOLIAN static Elm_Object_Item* 1797EOLIAN static Elm_Object_Item*
1776_elm_multibuttonentry_item_insert_before(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *before, const char *label, Evas_Smart_Cb func, void *data) 1798_efl_ui_multibuttonentry_item_insert_before(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Elm_Object_Item *before, const char *label, Evas_Smart_Cb func, void *data)
1777{ 1799{
1778 return _item_new(sd, label, MULTIBUTTONENTRY_POS_BEFORE, before, func, data); 1800 return _item_new(sd, label, MULTIBUTTONENTRY_POS_BEFORE, before, func, data);
1779} 1801}
1780 1802
1781EOLIAN static Elm_Object_Item* 1803EOLIAN static Elm_Object_Item*
1782_elm_multibuttonentry_item_insert_after(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data) 1804_efl_ui_multibuttonentry_item_insert_after(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data)
1783{ 1805{
1784 return _item_new(sd, label, MULTIBUTTONENTRY_POS_AFTER, after, func, data); 1806 return _item_new(sd, label, MULTIBUTTONENTRY_POS_AFTER, after, func, data);
1785} 1807}
1786 1808
1787EOLIAN static const Eina_List* 1809EOLIAN static const Eina_List*
1788_elm_multibuttonentry_items_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1810_efl_ui_multibuttonentry_items_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1789{ 1811{
1790 return sd->items; 1812 return sd->items;
1791} 1813}
1792 1814
1793EOLIAN static Elm_Object_Item* 1815EOLIAN static Elm_Object_Item*
1794_elm_multibuttonentry_first_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1816_efl_ui_multibuttonentry_first_item_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1795{ 1817{
1796 return eina_list_data_get(sd->items); 1818 return eina_list_data_get(sd->items);
1797} 1819}
1798 1820
1799EOLIAN static Elm_Object_Item* 1821EOLIAN static Elm_Object_Item*
1800_elm_multibuttonentry_last_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1822_efl_ui_multibuttonentry_last_item_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1801{ 1823{
1802 return eina_list_data_get(eina_list_last(sd->items)); 1824 return eina_list_data_get(eina_list_last(sd->items));
1803} 1825}
1804 1826
1805EOLIAN static Elm_Object_Item* 1827EOLIAN static Elm_Object_Item*
1806_elm_multibuttonentry_selected_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1828_efl_ui_multibuttonentry_selected_item_get(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1807{ 1829{
1808 return EO_OBJ(sd->selected_it); 1830 return EO_OBJ(sd->selected_it);
1809} 1831}
@@ -1821,7 +1843,7 @@ EOLIAN static Eina_Bool
1821_elm_multibuttonentry_item_selected_get(Eo *eo_item, 1843_elm_multibuttonentry_item_selected_get(Eo *eo_item,
1822 Elm_Multibuttonentry_Item_Data *item) 1844 Elm_Multibuttonentry_Item_Data *item)
1823{ 1845{
1824 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(item), sd, EINA_FALSE); 1846 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(item), sd, EINA_FALSE);
1825 if (!eo_item) return EINA_FALSE; 1847 if (!eo_item) return EINA_FALSE;
1826 if (EO_OBJ(sd->selected_it) == eo_item) 1848 if (EO_OBJ(sd->selected_it) == eo_item)
1827 return EINA_TRUE; 1849 return EINA_TRUE;
@@ -1830,7 +1852,7 @@ _elm_multibuttonentry_item_selected_get(Eo *eo_item,
1830} 1852}
1831 1853
1832EOLIAN static void 1854EOLIAN static void
1833_elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) 1855_efl_ui_multibuttonentry_clear(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd)
1834{ 1856{
1835 while (sd->items) 1857 while (sd->items)
1836 elm_wdg_item_del(eina_list_data_get(sd->items)); 1858 elm_wdg_item_del(eina_list_data_get(sd->items));
@@ -1846,7 +1868,7 @@ _elm_multibuttonentry_item_prev_get(const Eo *eo_it,
1846 Eina_List *l; 1868 Eina_List *l;
1847 Elm_Object_Item *eo_temp_it; 1869 Elm_Object_Item *eo_temp_it;
1848 1870
1849 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(it), sd, NULL); 1871 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(it), sd, NULL);
1850 1872
1851 EINA_LIST_FOREACH(sd->items, l, eo_temp_it) 1873 EINA_LIST_FOREACH(sd->items, l, eo_temp_it)
1852 { 1874 {
@@ -1867,7 +1889,7 @@ _elm_multibuttonentry_item_next_get(const Eo *eo_it,
1867 Eina_List *l; 1889 Eina_List *l;
1868 Elm_Object_Item *eo_temp_it; 1890 Elm_Object_Item *eo_temp_it;
1869 1891
1870 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(it), sd, NULL); 1892 EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(WIDGET(it), sd, NULL);
1871 1893
1872 EINA_LIST_FOREACH(sd->items, l, eo_temp_it) 1894 EINA_LIST_FOREACH(sd->items, l, eo_temp_it)
1873 { 1895 {
@@ -1907,7 +1929,7 @@ elm_multibuttonentry_item_data_set(Elm_Object_Item *it,
1907} 1929}
1908 1930
1909EOLIAN static void 1931EOLIAN static void
1910_elm_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) 1932_efl_ui_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
1911{ 1933{
1912 Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL; 1934 Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
1913 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; 1935 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
@@ -1931,7 +1953,7 @@ _elm_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Elm_Multibuttonent
1931} 1953}
1932 1954
1933EOLIAN static void 1955EOLIAN static void
1934_elm_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) 1956_efl_ui_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
1935{ 1957{
1936 Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL; 1958 Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
1937 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; 1959 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
@@ -1956,7 +1978,7 @@ _elm_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Elm_Multibuttonen
1956} 1978}
1957 1979
1958EOLIAN static void 1980EOLIAN static void
1959_elm_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) 1981_efl_ui_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
1960{ 1982{
1961 Eina_List *l; 1983 Eina_List *l;
1962 Elm_Multibuttonentry_Item_Filter *item_filter; 1984 Elm_Multibuttonentry_Item_Filter *item_filter;
@@ -1976,19 +1998,19 @@ _elm_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elm_Multibuttonent
1976} 1998}
1977 1999
1978static void 2000static void
1979_elm_multibuttonentry_class_constructor(Efl_Class *klass) 2001_efl_ui_multibuttonentry_class_constructor(Efl_Class *klass)
1980{ 2002{
1981 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 2003 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1982 2004
1983 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 2005 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
1984 _elm_multibuttonentry_smart_focus_next_enable = EINA_TRUE; 2006 _efl_ui_multibuttonentry_smart_focus_next_enable = EINA_TRUE;
1985} 2007}
1986 2008
1987EOLIAN static Eina_List* 2009EOLIAN static Eina_List*
1988_elm_multibuttonentry_efl_access_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd) 2010_efl_ui_multibuttonentry_efl_access_children_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
1989{ 2011{
1990 Eina_List *ret; 2012 Eina_List *ret;
1991 ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); 2013 ret = efl_access_children_get(efl_super(obj, EFL_UI_MULTIBUTTONENTRY_CLASS));
1992 return eina_list_merge(eina_list_clone(sd->items), ret); 2014 return eina_list_merge(eina_list_clone(sd->items), ret);
1993} 2015}
1994 2016
@@ -2042,7 +2064,7 @@ _key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
2042{ 2064{
2043 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it); 2065 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it);
2044 efl_event_callback_legacy_call 2066 efl_event_callback_legacy_call
2045 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj); 2067 (WIDGET(it), EFL_UI_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj);
2046 return EINA_TRUE; 2068 return EINA_TRUE;
2047} 2069}
2048 2070
@@ -2060,17 +2082,20 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo
2060 2082
2061/* Efl.Part begin */ 2083/* Efl.Part begin */
2062 2084
2063ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, Elm_Multibuttonentry_Data) 2085ELM_PART_OVERRIDE(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2064ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, Elm_Multibuttonentry_Data) 2086ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2065ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, Elm_Multibuttonentry_Data) 2087ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2066#include "elm_multibuttonentry_part.eo.c" 2088ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2089ELM_PART_OVERRIDE_TEXT_SET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2090ELM_PART_OVERRIDE_TEXT_GET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
2091#include "efl_ui_multibuttonentry_part.eo.c"
2067 2092
2068/* Efl.Part end */ 2093/* Efl.Part end */
2069/* Internal EO APIs and hidden overrides */ 2094/* Internal EO APIs and hidden overrides */
2070 2095
2071#define ELM_MULTIBUTTONENTRY_EXTRA_OPS \ 2096#define EFL_UI_MULTIBUTTONENTRY_EXTRA_OPS \
2072 ELM_LAYOUT_SIZING_EVAL_OPS(elm_multibuttonentry), \ 2097 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_multibuttonentry), \
2073 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_multibuttonentry) 2098 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_multibuttonentry)
2074 2099
2075#include "elm_multibuttonentry_item.eo.c" 2100#include "elm_multibuttonentry_item.eo.c"
2076#include "elm_multibuttonentry.eo.c" 2101#include "efl_ui_multibuttonentry.eo.c"
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/efl_ui_multibuttonentry.eo
index b37048f6d4..9462eb2a76 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/efl_ui_multibuttonentry.eo
@@ -1,12 +1,10 @@
1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]] 1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
2type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]] 2type Efl_Ui_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
3 3
4class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable) 4class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable)
5{ 5{
6 [[Elementary multibuttonentry class]] 6 [[Elementary multibuttonentry class]]
7 legacy_prefix: elm_multibuttonentry; 7 legacy_prefix: elm_multibuttonentry;
8 eo_prefix: elm_obj_multibuttonentry;
9 event_prefix: elm_multibuttonentry;
10 methods { 8 methods {
11 @property editable { 9 @property editable {
12 [[Control if the multibuttonentry is to be editable or not. 10 [[Control if the multibuttonentry is to be editable or not.
@@ -44,7 +42,7 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable)
44 @since 1.9]] 42 @since 1.9]]
45 } 43 }
46 values { 44 values {
47 format_function: Elm_Multibuttonentry_Format_Cb @nullable; [[Format_function The actual format function]] 45 format_function: Efl_Ui_Multibuttonentry_Format_Cb @nullable; [[Format_function The actual format function]]
48 data: const(void_ptr) @optional; [[Data User data to passed to $format_function]] 46 data: const(void_ptr) @optional; [[Data User data to passed to $format_function]]
49 } 47 }
50 } 48 }
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.h b/src/lib/elementary/efl_ui_multibuttonentry.h
new file mode 100644
index 0000000000..3c76aa76c7
--- /dev/null
+++ b/src/lib/elementary/efl_ui_multibuttonentry.h
@@ -0,0 +1,69 @@
1/**
2 * @defgroup efl_ui_multibuttonentry
3 * @ingroup Elementary
4 *
5 * @image html multibuttonentry_inheritance_tree.png
6 * @image latex multibuttonentry_inheritance_tree.eps
7 *
8 * A multi-button entry is a widget letting an user enter text and
9 * each chunk of text managed as a set of buttons. Each text button is
10 * inserted by pressing the "return" key. If there is no space in the
11 * current row, a new button is added to the next row. When a text
12 * button is pressed, it will become focused. Backspace removes the
13 * focus. When the multi-button entry loses focus, items longer than
14 * one line are shrunk to one line.
15 *
16 * The typical use case of multi-button entry is composing
17 * emails/messages to a group of addresses, each of which is an item
18 * that can be clicked for further actions.
19 *
20 * This widget inherits from the @ref Layout one, so that all the
21 * functions acting on it also work for multi-button entry objects (since 1.8).
22 *
23 * This widget emits the following signals, besides the ones sent from
24 * @ref Layout:
25 * - @c "item,selected" - this is called when an item is selected by
26 * api, user interaction, and etc. this is also called when a
27 * user press back space while cursor is on the first field of
28 * entry.
29 * - @c "item,added" - when a new multi-button entry item is added.
30 * - @c "item,deleted" - when a multi-button entry item is deleted.
31 * - @c "item,clicked" - this is called when an item is clicked by user
32 * interaction. Both "item,selected" and "item,clicked" are needed.
33 * - @c "item,longpressed" - when multi-button entry item is pressed for a long time.
34 * - @c "clicked" - when multi-button entry is clicked.
35 * - @c "focused" - when multi-button entry is focused.
36 * - @c "unfocused" - when multi-button entry is unfocused.
37 * - @c "expanded" - when multi-button entry is expanded.
38 * - @c "contracted" - when multi-button entry is contracted.
39 * - @c "expand,state,changed" - when shrink mode state of
40 * multi-button entry is changed.
41 *
42 * Default text parts of the multi-button entry widget that you can use are:
43 * @li "default" - A label of the multi-button entry
44 *
45 * Default text parts of multi-button entry @b items that you can use are:
46 * @li "default" - A label of the multi-button entry item
47 *
48 * Supported elm_object_item common APIs.
49 * @li @ref elm_object_item_del
50 * @li @ref elm_object_item_part_text_set
51 * @li @ref elm_object_item_part_text_get
52 */
53
54
55/**
56 * @addtogroup Multibuttonentry
57 * @{
58 */
59
60#include "efl_ui_multibuttonentry_common.h"
61#ifdef EFL_EO_API_SUPPORT
62#include "efl_ui_multibuttonentry_eo.h"
63#endif
64#ifndef EFL_NOLEGACY_API_SUPPORT
65#include "elc_multibuttonentry_legacy.h"
66#endif
67/**
68 * @}
69 */
diff --git a/src/lib/elementary/elc_multibuttonentry_eo.h b/src/lib/elementary/efl_ui_multibuttonentry_eo.h
index 4d958bd55b..b6158a8927 100644
--- a/src/lib/elementary/elc_multibuttonentry_eo.h
+++ b/src/lib/elementary/efl_ui_multibuttonentry_eo.h
@@ -1,2 +1,2 @@
1#include "elm_multibuttonentry_item.eo.h" 1#include "elm_multibuttonentry_item.eo.h"
2#include "elm_multibuttonentry.eo.h" 2#include "efl_ui_multibuttonentry.eo.h"
diff --git a/src/lib/elementary/efl_ui_multibuttonentry_part.eo b/src/lib/elementary/efl_ui_multibuttonentry_part.eo
new file mode 100644
index 0000000000..f88a59cd1a
--- /dev/null
+++ b/src/lib/elementary/efl_ui_multibuttonentry_part.eo
@@ -0,0 +1,11 @@
1class Efl.Ui.Multibuttonentry.Part (Efl.Ui.Layout.Part_Content, Efl.Text)
2{
3 [[Elementary multibuttonentry internal part class]]
4 data: null;
5 implements {
6 Efl.Container.content { set; get; }
7 Efl.Container.content_unset;
8 Efl.Text.text { set; get; }
9 }
10}
11
diff --git a/src/lib/elementary/elm_widget_multibuttonentry.h b/src/lib/elementary/efl_ui_multibuttonentry_private.h
index ca8b58e03e..64acf38e87 100644
--- a/src/lib/elementary/elm_widget_multibuttonentry.h
+++ b/src/lib/elementary/efl_ui_multibuttonentry_private.h
@@ -70,9 +70,9 @@ typedef struct _Elm_Multibuttonentry_Item_Filter
70 void *data; 70 void *data;
71} Elm_Multibuttonentry_Item_Filter; 71} Elm_Multibuttonentry_Item_Filter;
72 72
73typedef struct _Elm_Multibuttonentry_Data 73typedef struct _Efl_Ui_Multibuttonentry_Data
74 Elm_Multibuttonentry_Data; 74 Efl_Ui_Multibuttonentry_Data;
75struct _Elm_Multibuttonentry_Data 75struct _Efl_Ui_Multibuttonentry_Data
76{ 76{
77 Evas_Object *parent; 77 Evas_Object *parent;
78 Evas_Object *box; 78 Evas_Object *box;
@@ -88,7 +88,7 @@ struct _Elm_Multibuttonentry_Data
88 Elm_Multibuttonentry_Item_Data *selected_it; /* selected item */ 88 Elm_Multibuttonentry_Item_Data *selected_it; /* selected item */
89 Elm_Multibuttonentry_Item_Data *focused_it; 89 Elm_Multibuttonentry_Item_Data *focused_it;
90 90
91 Elm_Multibuttonentry_Format_Cb format_func; 91 Efl_Ui_Multibuttonentry_Format_Cb format_func;
92 const void *format_func_data; 92 const void *format_func_data;
93 93
94 const char *label_str, *guide_text_str; 94 const char *label_str, *guide_text_str;
@@ -104,7 +104,7 @@ struct _Elm_Multibuttonentry_Data
104 104
105 Eina_Bool last_it_select : 1; 105 Eina_Bool last_it_select : 1;
106 Eina_Bool editable : 1; 106 Eina_Bool editable : 1;
107 Eina_Bool focused : 1; // avoids infinite loop on focus in/out 107 Eina_Bool focused : 1;
108 Eina_Bool label_packed : 1; 108 Eina_Bool label_packed : 1;
109 109
110 Ecore_Timer *longpress_timer; 110 Ecore_Timer *longpress_timer;
@@ -114,11 +114,11 @@ struct _Elm_Multibuttonentry_Data
114 * @} 114 * @}
115 */ 115 */
116 116
117#define ELM_MULTIBUTTONENTRY_DATA_GET(o, sd) \ 117#define EFL_UI_MULTIBUTTONENTRY_DATA_GET(o, sd) \
118 Elm_Multibuttonentry_Data *sd = efl_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); 118 Efl_Ui_Multibuttonentry_Data *sd = efl_data_scope_get(o, EFL_UI_MULTIBUTTONENTRY_CLASS);
119 119
120#define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \ 120#define EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \
121 ELM_MULTIBUTTONENTRY_DATA_GET(o, ptr); \ 121 EFL_UI_MULTIBUTTONENTRY_DATA_GET(o, ptr); \
122 if (EINA_UNLIKELY(!ptr)) \ 122 if (EINA_UNLIKELY(!ptr)) \
123 { \ 123 { \
124 CRI("No widget data for object %p (%s)", \ 124 CRI("No widget data for object %p (%s)", \
@@ -126,8 +126,8 @@ struct _Elm_Multibuttonentry_Data
126 return; \ 126 return; \
127 } 127 }
128 128
129#define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ 129#define EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
130 Elm_Multibuttonentry_Data * ptr = efl_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); \ 130 Efl_Ui_Multibuttonentry_Data * ptr = efl_data_scope_get(o, EFL_UI_MULTIBUTTONENTRY_CLASS); \
131 if (EINA_UNLIKELY(!ptr)) \ 131 if (EINA_UNLIKELY(!ptr)) \
132 { \ 132 { \
133 CRI("No widget data for object %p (%s)", \ 133 CRI("No widget data for object %p (%s)", \
diff --git a/src/lib/elementary/elc_multibuttonentry.h b/src/lib/elementary/elc_multibuttonentry.h
index 75fe7a1b99..b878f7829c 100644
--- a/src/lib/elementary/elc_multibuttonentry.h
+++ b/src/lib/elementary/elc_multibuttonentry.h
@@ -59,7 +59,7 @@
59 59
60#include "elc_multibuttonentry_common.h" 60#include "elc_multibuttonentry_common.h"
61#ifdef EFL_EO_API_SUPPORT 61#ifdef EFL_EO_API_SUPPORT
62#include "elc_multibuttonentry_eo.h" 62#include "efl_ui_multibuttonentry_eo.h"
63#endif 63#endif
64#ifndef EFL_NOLEGACY_API_SUPPORT 64#ifndef EFL_NOLEGACY_API_SUPPORT
65#include "elc_multibuttonentry_legacy.h" 65#include "elc_multibuttonentry_legacy.h"
diff --git a/src/lib/elementary/elc_multibuttonentry_common.h b/src/lib/elementary/elc_multibuttonentry_common.h
index b076385698..8601dbffcc 100644
--- a/src/lib/elementary/elc_multibuttonentry_common.h
+++ b/src/lib/elementary/elc_multibuttonentry_common.h
@@ -30,4 +30,4 @@ typedef Eina_Bool (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_
30 * 30 *
31 * @ingroup Multibuttonentry 31 * @ingroup Multibuttonentry
32 */ 32 */
33typedef char * (*Elm_Multibuttonentry_Format_Cb)(int count, void *data); 33typedef char * (*Efl_Ui_Multibuttonentry_Format_Cb)(int count, void *data);
diff --git a/src/lib/elementary/elc_multibuttonentry_legacy.h b/src/lib/elementary/elc_multibuttonentry_legacy.h
index 84c66d1186..157ffb645a 100644
--- a/src/lib/elementary/elc_multibuttonentry_legacy.h
+++ b/src/lib/elementary/elc_multibuttonentry_legacy.h
@@ -10,4 +10,4 @@
10EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent); 10EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent);
11 11
12#include "elm_multibuttonentry_item.eo.legacy.h" 12#include "elm_multibuttonentry_item.eo.legacy.h"
13#include "elm_multibuttonentry.eo.legacy.h" 13#include "efl_ui_multibuttonentry.eo.legacy.h"
diff --git a/src/lib/elementary/elm_multibuttonentry_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo
deleted file mode 100644
index cd2f84943e..0000000000
--- a/src/lib/elementary/elm_multibuttonentry_part.eo
+++ /dev/null
@@ -1,9 +0,0 @@
1class Elm.Multibuttonentry.Part (Efl.Ui.Layout.Part_Legacy)
2{
3 [[Elementary multibuttonentry internal part class]]
4 data: null;
5 implements {
6 Efl.Text.text { set; get; }
7 }
8}
9