elm_box_pack_end(bx, sc);
ctxpopup = elm_ctxpopup_add(obj);
- elm_ctxpopup_content_set(ctxpopup, bx);
+ elm_object_content_set(ctxpopup, bx);
evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
evas_object_move(ctxpopup, x, y);
if (btn_label)
elm_object_text_set(btn, btn_label);
if (icon)
- elm_button_icon_set(btn, icon);
+ elm_object_content_set(btn, icon);
elm_object_focus_allow_set(btn, EINA_FALSE);
evas_object_smart_callback_add(btn, "clicked", func, data);
edje_object_part_swallow(item->base, buf, btn);
wd->x = x;
wd->y = y;
evas_object_move(wd->edje, x, y);
- evas_object_geometry_get(elm_layout_content_get(wd->edje, "bg_image"), NULL, NULL, &width, NULL);
+ evas_object_geometry_get(elm_object_content_part_get(wd->edje, "bg_image"), NULL, NULL, &width, NULL);
evas_object_geometry_get(wd->edje, &x_, &y_, NULL, NULL);
}
wd->w = w;
wd->h = h;
evas_object_resize(wd->edje, w, h);
- evas_object_geometry_get(elm_layout_content_get(wd->edje, "bg_image"), NULL, NULL, &width, &height);
+ evas_object_geometry_get(elm_object_content_part_get(wd->edje, "bg_image"), NULL, NULL, &width, &height);
evas_object_geometry_get(wd->edje, &x_, &y_, NULL, NULL);
}
if (it->style == TABBAR)
{
- content = elm_layout_content_unset(wd->edje, "elm.swallow.view");
+ content = elm_object_content_part_unset(wd->edje, "elm.swallow.view");
if (content) evas_object_hide(content);
EINA_LIST_FOREACH(wd->items, l, item){
evas_object_smart_callback_call(it->obj, "view,change,before", it);
}
- elm_layout_content_set(wd->edje, "elm.swallow.view", it->view);
+ elm_object_content_part_set(wd->edje, "elm.swallow.view", it->view);
}
else if (it->style == TOOLBAR)
{
evas_object_size_hint_max_set(icon, 100, 100);
evas_object_show(icon);
if (obj && part)
- elm_button_icon_set(obj, icon);
+ elm_object_content_set(obj, icon);
return icon;
}
*item = elm_button_add(parent);
if (*item == NULL) return NULL;
elm_object_style_set(*item, "controlbar/vertical");
- elm_layout_content_set(obj, "item", *item);
+ elm_object_content_part_set(obj, "item", *item);
if (it->text)
elm_object_text_set(*item, it->text);
evas_object_size_hint_weight_set(it->base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(it->base, EVAS_HINT_FILL, EVAS_HINT_FILL);
it->base_item = obj_item;
- elm_layout_content_set(it->base, "item", it->base_item);
+ elm_object_content_part_set(it->base, "item", it->base_item);
evas_object_show(it->base);
return it;
}
if (item->style == TABBAR)
{
- content = elm_layout_content_unset(wd->edje, "elm.swallow.view");
+ content = elm_object_content_part_unset(wd->edje, "elm.swallow.view");
evas_object_hide(content);
item->selected = EINA_TRUE;
evas_object_smart_callback_call(item->obj, "view,change,before", item);
- elm_layout_content_set(wd->edje, "elm.swallow.view", item->view);
+ elm_object_content_part_set(wd->edje, "elm.swallow.view", item->view);
}
if ((item->style == TOOLBAR) && (item->func))
printf("Cannot load bg edj\n");
return NULL;
}
- elm_layout_content_set(wd->edje, "bg_image", wd->bg);
+ elm_object_content_part_set(wd->edje, "bg_image", wd->bg);
// initialization
evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_RESIZE,
evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_HIDE,
_controlbar_object_hide, obj);
- bg = elm_layout_content_get(wd->edje, "bg_image");
+ bg = elm_object_content_part_get(wd->edje, "bg_image");
evas_object_event_callback_add(bg, EVAS_CALLBACK_MOVE, _controlbar_object_move, obj);
evas_object_event_callback_add(bg, EVAS_CALLBACK_RESIZE, _controlbar_object_resize, obj);
evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wd->box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_layout_content_set(wd->edje, "elm.swallow.items", wd->box);
+ elm_object_content_part_set(wd->edje, "elm.swallow.items", wd->box);
evas_object_show(wd->box);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
if (!wd) return NULL;
Evas_Object *content;
- if (it->view == elm_layout_content_get(wd->edje, "elm.swallow.view"))
+ if (it->view == elm_object_content_part_get(wd->edje, "elm.swallow.view"))
{
- content = elm_layout_content_unset(wd->edje, "elm.swallow.view");
+ content = elm_object_content_part_unset(wd->edje, "elm.swallow.view");
if (content) evas_object_hide(content);
}
else
edje_object_signal_emit(_EDJ(wd->edje), "elm,state,small", "elm");
break;
case ELM_CONTROLBAR_MODE_LEFT:
- selected_box = elm_layout_content_get(wd->edje, "elm.dragable.box");
+ selected_box = elm_object_content_part_get(wd->edje, "elm.dragable.box");
if (selected_box) edje_object_signal_emit(_EDJ(selected_box), "elm,state,left", "elm");
wd->selected_signal = eina_stringshare_add("elm,state,selected_left");
wd->pressed_signal = eina_stringshare_add("elm,state,pressed_left");
_sizing_eval(obj);
return;
case ELM_CONTROLBAR_MODE_RIGHT:
- selected_box = elm_layout_content_get(wd->edje, "elm.dragable.box");
+ selected_box = elm_object_content_part_get(wd->edje, "elm.dragable.box");
if (selected_box) edje_object_signal_emit(_EDJ(selected_box), "elm,state,right", "elm");
wd->selected_signal = eina_stringshare_add("elm,state,selected_right");
wd->pressed_signal = eina_stringshare_add("elm,state,pressed_right");
default:
break;
}
- selected_box = elm_layout_content_get(wd->edje, "elm.dragable.box");
+ selected_box = elm_object_content_part_get(wd->edje, "elm.dragable.box");
if (selected_box) edje_object_signal_emit(_EDJ(selected_box), "elm,state,default", "elm");
wd->selected_signal = eina_stringshare_add("elm,state,selected");
wd->pressed_signal = eina_stringshare_add("elm,state,pressed");
elm_ctxpopup_direction_priority_set(wd->ctxpopup, ELM_CTXPOPUP_DIRECTION_DOWN,
ELM_CTXPOPUP_DIRECTION_UP, -1, -1);
- elm_ctxpopup_content_set(wd->ctxpopup, diskselector);
+ elm_object_content_set(wd->ctxpopup, diskselector);
snprintf(buf,sizeof(buf), EDC_PART_ITEM_STR, wd->selected_it->location);
edj_part = edje_object_part_object_get(wd->base, buf);
evas_object_geometry_get(edj_part, &x, &y, &w, &h);
eina_stringshare_replace(&item->location, location);
_set_item_theme(item, location);
- elm_layout_content_set(item->bg_layout, "swallow", item->content);
+ elm_object_content_part_set(item->bg_layout, "swallow", item->content);
if ((item->press == EINA_TRUE) && (item->disabled == EINA_FALSE))
edje_object_signal_emit(elm_layout_edje_get(item->bg_layout), "elm,state,press,on", "elm");
else
evas_object_size_hint_align_set(item->bg_layout, EVAS_HINT_FILL, 0.0);
evas_object_show(item->bg_layout);
- elm_layout_content_set(item->bg_layout, "swallow", item->content);
+ elm_object_content_part_set(item->bg_layout, "swallow", item->content);
return item;
}
wd->ly[BLOCK_LEFT] = wd->ly[BLOCK_CENTER];
wd->ly[BLOCK_CENTER] = wd->ly[BLOCK_RIGHT];
wd->ly[BLOCK_RIGHT] = ly_temp;
- elm_layout_content_set(wd->ly[BLOCK_RIGHT], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[BLOCK_RIGHT], "swl.photo", NULL);
}
else
{
wd->ly[BLOCK_RIGHT] = wd->ly[BLOCK_CENTER];
wd->ly[BLOCK_CENTER] = wd->ly[BLOCK_LEFT];
wd->ly[BLOCK_LEFT] = ly_temp;
- elm_layout_content_set(wd->ly[BLOCK_LEFT], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[BLOCK_LEFT], "swl.photo", NULL);
}
}
it = eina_list_data_get(l[state]);
- eo = (Evas_Object*)elm_layout_content_get(wd->ly[state], "swl.photo");
+ eo = (Evas_Object*)elm_object_content_part_get(wd->ly[state], "swl.photo");
if (eo)
evas_object_geometry_get(eo, &ix, &iy, &iw, &ih);
edje_object_part_drag_value_get(elm_layout_edje_get(wd->ly[state]), "swl.photo", &dx, &dy);
if ((iw != wd->w) || ((dx != 0) || (dy != 0)))
{
- elm_layout_content_set(wd->ly[state], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[state], "swl.photo", NULL);
}
else
return 1;
for (i = 0; i < BLOCK_MAX; i++)
{
- eo = (Evas_Object*)elm_layout_content_get((const Evas_Object*)wd->ly[i], "swl.photo");
+ eo = (Evas_Object*)elm_object_content_part_get((const Evas_Object*)wd->ly[i], "swl.photo");
if (!l[i])
{
- elm_layout_content_set(wd->ly[i], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[i], "swl.photo", NULL);
}
else
{
eo = elm_image_add(wd->obj);
//elm_image_prescale_set(eo, wd->w);
elm_image_file_set(eo, it->photo_file, NULL);
- elm_layout_content_set(wd->ly[i], "swl.photo", eo);
+ elm_object_content_part_set(wd->ly[i], "swl.photo", eo);
}
}
}
for (i = 0; i < BLOCK_MAX; i++)
{
- eo = (Evas_Object*)elm_layout_content_get(wd->ly[i], "swl.photo");
+ eo = (Evas_Object*)elm_object_content_part_get(wd->ly[i], "swl.photo");
if (eo)
- elm_layout_content_set(wd->ly[i], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[i], "swl.photo", NULL);
}
_imageslider_update(wd);
}
if (wd->ani_lock) return;
if (it == eina_list_data_get(eina_list_prev(wd->cur)))
- elm_layout_content_set(wd->ly[BLOCK_LEFT], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[BLOCK_LEFT], "swl.photo", NULL);
else if (it == eina_list_data_get(wd->cur))
- elm_layout_content_set(wd->ly[BLOCK_CENTER], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[BLOCK_CENTER], "swl.photo", NULL);
else if (it == eina_list_data_get(eina_list_next(wd->cur)))
- elm_layout_content_set(wd->ly[BLOCK_RIGHT], "swl.photo", NULL);
+ elm_object_content_part_set(wd->ly[BLOCK_RIGHT], "swl.photo", NULL);
_imageslider_update(wd);
}
elm_object_style_set(action_data->btn, buf);
++index;
snprintf(buf, sizeof(buf), "actionbtn%d", index);
- elm_layout_content_set(wd->action_area, buf, action_data->btn);
+ elm_object_content_part_set(wd->action_area, buf, action_data->btn);
}
- elm_layout_content_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
+ elm_object_content_part_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
}
if (wd->content_area)
{
{
snprintf(buf, sizeof(buf), "popup_description/%s", elm_widget_style_get(obj));
elm_object_style_set(wd->desc_label, buf);
- elm_layout_content_set(wd->content_area, "elm.swallow.content", wd->desc_label);
+ elm_object_content_part_set(wd->content_area, "elm.swallow.content", wd->desc_label);
}
else if (wd->content)
{
- elm_layout_content_set(wd->content_area, "elm.swallow.content", wd->content);
+ elm_object_content_part_set(wd->content_area, "elm.swallow.content", wd->content);
}
- elm_layout_content_set(wd->layout, "elm.swallow.content", wd->content_area);
+ elm_object_content_part_set(wd->layout, "elm.swallow.content", wd->content_area);
}
if (wd->title_area)
{
btn = _elm_popup_add_button(obj, text, response);
++index;
snprintf(buf, sizeof(buf), "actionbtn%d", index);
- elm_layout_content_set(wd->action_area, buf, btn);
+ elm_object_content_part_set(wd->action_area, buf, btn);
evas_object_event_callback_add(wd->action_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
text = va_arg(args, char*);
evas_object_size_hint_align_set(wd->layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_layout_theme_set(wd->layout, "popup", "base", elm_widget_style_get(obj));
- elm_notify_content_set(wd->notify, wd->layout);
+ elm_object_content_set(wd->notify, wd->layout);
edje_object_signal_callback_add(elm_layout_edje_get(wd->layout), "elm,state,title,visible", "elm", _state_set_cb, obj);
edje_object_signal_callback_add(elm_layout_edje_get(wd->layout), "elm,state,button,visible", "elm", _state_set_cb, obj);
va_list args;
va_start(args, first_button_text);
wd->action_area = elm_layout_add(popup);
- elm_layout_content_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
+ elm_object_content_part_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
snprintf(buf,sizeof(buf), "buttons%d", no_of_buttons);
wd->no_of_buttons = no_of_buttons;
elm_layout_theme_set(wd->action_area, "popup", buf, elm_widget_style_get(popup));
evas_object_size_hint_weight_set(wd->desc_label, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(wd->desc_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(wd->desc_label);
- elm_layout_content_set(wd->content_area, "elm.swallow.content", wd->desc_label);
- elm_layout_content_set(wd->layout, "elm.swallow.content", wd->content_area);
+ elm_object_content_part_set(wd->content_area, "elm.swallow.content", wd->desc_label);
+ elm_object_content_part_set(wd->layout, "elm.swallow.content", wd->content_area);
evas_object_event_callback_add(wd->content_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
_sizing_eval(obj);
wd->title_icon = NULL;
}
wd->title_icon = icon;
- elm_layout_content_set(wd->layout, "elm.swallow.title.icon", wd->title_icon);
+ elm_object_content_part_set(wd->layout, "elm.swallow.title.icon", wd->title_icon);
edje_object_signal_emit(elm_layout_edje_get(wd->layout), "elm,state,title,icon,visible", "elm");
edje_object_message_signal_process(wd->layout);
_sizing_eval(obj);
{
wd->content_area = elm_layout_add(obj);
elm_layout_theme_set(wd->content_area, "popup","content", elm_widget_style_get(obj));
- elm_layout_content_set(wd->content_area, "elm.swallow.content", content);
- elm_layout_content_set(wd->layout, "elm.swallow.content", wd->content_area);
+ elm_object_content_part_set(wd->content_area, "elm.swallow.content", content);
+ elm_object_content_part_set(wd->layout, "elm.swallow.content", wd->content_area);
evas_object_event_callback_add(wd->content_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
}
wd->action_area = NULL;
}
wd->action_area = elm_layout_add(obj);
- elm_layout_content_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
+ elm_object_content_part_set(wd->layout, "elm.swallow.buttonArea", wd->action_area);
evas_object_size_hint_weight_set(wd->action_area, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wd->action_area, EVAS_HINT_FILL, EVAS_HINT_FILL);
snprintf(buf, sizeof(buf), "buttons%d", no_of_buttons);