aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_button.c6
-rw-r--r--src/lib/elementary/efl_ui_clock.c2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c2
-rw-r--r--src/lib/elementary/efl_ui_layout_object.c61
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c4
-rw-r--r--src/lib/elementary/efl_ui_pager.c8
-rw-r--r--src/lib/elementary/efl_ui_panes.c6
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c2
-rw-r--r--src/lib/elementary/efl_ui_scroller.c60
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c2
-rw-r--r--src/lib/elementary/els_tooltip.c20
12 files changed, 96 insertions, 79 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index fb6431880a..1e7dedd4de 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -40,12 +40,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = {
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index bad166ced6..1b80ab6678 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -895,7 +895,7 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
Elm_Access_Info *ai;
priv->access_obj = _elm_access_edje_object_part_object_register
- (obj, elm_layout_edje_get(obj), "elm.access");
+ (obj, elm_layout_edje_get(obj), "efl.access");
if (!priv->access_obj)
priv->access_obj = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access");
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 2429d210b9..55f8b1d365 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -206,7 +206,7 @@ _fields_init(Eo *obj)
{
if (strchr(fmt_char[i], ch))
{
- snprintf(buf, sizeof(buf), "field%d", field++);
+ snprintf(buf, sizeof(buf), "efl.field%d", field++);
if (i == DATEPICKER_YEAR)
efl_content_set(efl_part(obj, buf), pd->year);
else if (i == DATEPICKER_MONTH)
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c
index b7f2052523..76bbd10422 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout_object.c
@@ -186,7 +186,7 @@ _signals_emit(Eo *obj,
snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
set ? "set" : "unset");
}
- efl_layout_signal_emit(obj, buf, "elm");
+ efl_layout_signal_emit(obj, buf, "elm");
}
static inline void
@@ -219,16 +219,22 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
if (!_efl_ui_layout_swallow_parts[i]) return;
if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break;
}
-
}
- if (elm_widget_is_legacy(sd->obj) &&
- !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
- type = sub_d->part + strlen("elm.swallow.");
- else if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
- type = sub_d->part + strlen("efl.");
+ if (elm_widget_is_legacy(sd->obj))
+ {
+ if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
+ type = sub_d->part + strlen("elm.swallow.");
+ else
+ type = sub_d->part;
+ }
else
- type = sub_d->part;
+ {
+ if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
+ type = sub_d->part + strlen("efl.");
+ else
+ type = sub_d->part;
+ }
_signals_emit(sd->obj, type, visible);
@@ -246,30 +252,37 @@ _text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
//FIXME: Don't limit to "elm.text" prefix.
//Send signals for all text parts after elm 2.0
+ if (sub_d->type != TEXT) return;
- if (sub_d->type != TEXT)
+ if (elm_widget_is_legacy(sd->obj))
{
- if (elm_widget_is_legacy(sd->obj) &&
- !((!strcmp("elm.text", sub_d->part)) ||
+ if (!((!strcmp("elm.text", sub_d->part)) ||
(!strncmp("elm.text.", sub_d->part, 9))))
- {
- return;
- }
- else if (!((!strcmp("efl.text", sub_d->part)) ||
- (!strncmp("efl.text.", sub_d->part, 9))))
- {
- return;
- }
+ return;
+ }
+ else
+ {
+ if (!((!strcmp("efl.text", sub_d->part)) ||
+ (!strncmp("efl.text.", sub_d->part, 9))))
+ return;
}
ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
- if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
- type = sub_d->part + strlen("elm.text.");
- else if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
- type = sub_d->part + strlen("efl.");
+ if (elm_widget_is_legacy(sd->obj))
+ {
+ if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
+ type = sub_d->part + strlen("elm.text.");
+ else
+ type = sub_d->part;
+ }
else
- type = sub_d->part;
+ {
+ if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
+ type = sub_d->part + strlen("efl.");
+ else
+ type = sub_d->part;
+ }
_signals_emit(sd->obj, type, visible);
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 2f607b180d..2a1720d13c 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -59,7 +59,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
/* Standard widget overrides */
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
-ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "text")
+ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "efl.text")
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
#define EFL_UI_NAVIGATION_BAR_EXTRA_OPS \
@@ -106,7 +106,7 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
}
else if (eina_streq(part, "right_content"))
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
-
+
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
}
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index 0017e766d4..921d7676f9 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -251,7 +251,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
evas_object_color_set(pd->event, 0, 0, 0, 0);
evas_object_repeat_events_set(pd->event, EINA_TRUE);
- efl_content_set(efl_part(obj, "event"), pd->event);
+ efl_content_set(efl_part(obj, "efl.event"), pd->event);
efl_event_callback_add(pd->event, EFL_EVENT_POINTER_DOWN,
_mouse_down_cb, obj);
@@ -264,7 +264,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
static void
_event_handler_del(Eo *obj, Efl_Ui_Pager_Data *pd)
{
- efl_content_unset(efl_part(obj, "event"));
+ efl_content_unset(efl_part(obj, "efl.event"));
efl_del(pd->event);
pd->event = NULL;
}
@@ -352,7 +352,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
elm_widget_can_focus_set(obj, EINA_TRUE);
pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
- efl_content_set(efl_part(obj, "page_root"), pd->page_root);
+ efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root);
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
@@ -671,7 +671,7 @@ _efl_ui_pager_indicator_set(Eo *obj EINA_UNUSED,
if (!pd->idbox)
{
pd->idbox = efl_add(EFL_UI_BOX_CLASS, obj);
- efl_content_set(efl_part(obj, "indicator"), pd->idbox);
+ efl_content_set(efl_part(obj, "efl.indicator"), pd->idbox);
}
efl_page_indicator_bind(pd->indicator, obj, pd->idbox);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7699889454..57b4ecfe03 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -450,7 +450,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
if (elm_widget_is_legacy(obj))
{
if (edje_object_part_exists
- (wd->resize_obj, "elm.swallow.event"))
+ (wd->resize_obj, "elm.swallow.event"))
{
Evas_Coord minw = 0, minh = 0;
@@ -462,7 +462,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
else
{
if (edje_object_part_exists
- (wd->resize_obj, "efl.event"))
+ (wd->resize_obj, "efl.event"))
{
Evas_Coord minw = 0, minh = 0;
@@ -470,7 +470,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
evas_object_size_hint_min_set(sd->event, minw, minh);
elm_layout_content_set(obj, "efl.event", sd->event);
}
- }
+ }
elm_widget_sub_object_add(obj, sd->event);
elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 08097fc8d1..0799635a1a 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -168,7 +168,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]);
}
- elm_layout_signal_emit(obj, "elm,efl.buttons,show", "elm");
+ elm_layout_signal_emit(obj, "elm,buttons,show", "elm");
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
}
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 47a932ad4d..c0869578be 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -72,9 +72,9 @@ _efl_ui_scroller_bar_read_and_update(Eo *obj)
double vx, vy;
edje_object_part_drag_value_get
- (wd->resize_obj, "dragable.vbar", NULL, &vy);
+ (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "dragable.hbar", &vx, NULL);
+ (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
}
@@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
edje_object_calc_force(wd->resize_obj);
efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
- edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
}
static void
@@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
double posx = 0.0, posy = 0.0;
efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
- edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
}
static void
@@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
efl_layout_signal_callback_add
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+ (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
obj);
efl_layout_signal_callback_add
- (obj, "drag,set", "dragable.vbar",
+ (obj, "drag,set", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,start", "dragable.vbar",
+ (obj, "drag,start", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,stop", "dragable.vbar",
+ (obj, "drag,stop", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,step", "dragable.vbar",
+ (obj, "drag,step", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,page", "dragable.vbar",
+ (obj, "drag,page", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "elm,vbar,press", "elm",
@@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
(obj, "elm,vbar,unpress", "elm",
_efl_ui_scroller_vbar_unpress_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+ (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
obj);
efl_layout_signal_callback_add
- (obj, "drag,set", "dragable.hbar",
+ (obj, "drag,set", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,start", "dragable.hbar",
+ (obj, "drag,start", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,stop", "dragable.hbar",
+ (obj, "drag,stop", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,step", "dragable.hbar",
+ (obj, "drag,step", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,page", "dragable.hbar",
+ (obj, "drag,page", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "elm,hbar,press", "elm",
@@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
efl_layout_signal_callback_del
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+ (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
obj);
efl_layout_signal_callback_del
- (obj, "drag,set", "dragable.vbar",
+ (obj, "drag,set", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,start", "dragable.vbar",
+ (obj, "drag,start", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,stop", "dragable.vbar",
+ (obj, "drag,stop", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,step", "dragable.vbar",
+ (obj, "drag,step", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,page", "dragable.vbar",
+ (obj, "drag,page", "efl.dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "elm,vbar,press", "elm",
@@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
(obj, "elm,vbar,unpress", "elm",
_efl_ui_scroller_vbar_unpress_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+ (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
obj);
efl_layout_signal_callback_del
- (obj, "drag,set", "dragable.hbar",
+ (obj, "drag,set", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,start", "dragable.hbar",
+ (obj, "drag,start", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,stop", "dragable.hbar",
+ (obj, "drag,stop", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,step", "dragable.hbar",
+ (obj, "drag,step", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,page", "dragable.hbar",
+ (obj, "drag,page", "efl.dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "elm,hbar,press", "elm",
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index f4e0692ade..2a37bce479 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -883,7 +883,7 @@ _efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_B
const char *name;
name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
if (name) return name;
- const char *ret = elm_layout_text_get(obj, "text");
+ const char *ret = elm_layout_text_get(obj, "efl.text");
return ret;
}
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 49a4e38974..9d005547e3 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -163,7 +163,7 @@ _fields_init(Eo *obj)
{
if (strchr(fmt_char[i], ch))
{
- snprintf(buf, sizeof(buf), "field%d", field);
+ snprintf(buf, sizeof(buf), "efl.field%d", field);
if (i == TIMEPICKER_HOUR)
efl_content_set(efl_part(obj, buf), pd->hour);
else if (i == TIMEPICKER_MIN)
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index e4e53523ba..2defddeaa4 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -491,8 +491,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
tt->changed_style = EINA_FALSE;
if (tt->tooltip)
- edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
- tt->content);
+ {
+ if (elm_widget_is_legacy(tt->owner))
+ edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
+ tt->content);
+ else
+ edje_object_part_swallow(tt->tooltip, "efl.content",
+ tt->content);
+ }
edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
}
@@ -519,11 +525,15 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
tt->tooltip = NULL;
return;
}
- edje_object_part_swallow
- (tt->tooltip, "elm.swallow.content", tt->content);
+ if (elm_widget_is_legacy(tt->owner))
+ edje_object_part_swallow
+ (tt->tooltip, "elm.swallow.content", tt->content);
+ else
+ edje_object_part_swallow
+ (tt->tooltip, "efl.content", tt->content);
new_content = EINA_TRUE;
evas_object_event_callback_add(tt->content, EVAS_CALLBACK_DEL,
- _elm_tooltip_content_del_cb, tt);
+ _elm_tooltip_content_del_cb, tt);
/* tooltip has to use layer tooltip */
evas_object_layer_set(tt->tooltip, ELM_OBJECT_LAYER_TOOLTIP);