aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-23 21:14:47 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-23 21:14:47 +0900
commitab66f39e9aa47d158d4f3db8fb5a7ad3e6e08577 (patch)
tree00c1262d870209d614c40e8eb2b1ba728507845f
parentefl_part: remove the elm legacy name of efl ui theme (diff)
downloadefl-devs/jaehyun/efl_part_legacy_remove2.tar.gz
Apply patch to remove "efl." in signaldevs/jaehyun/efl_part_legacy_remove2
-rw-r--r--data/elementary/themes/edc/efl/bg.edc4
-rw-r--r--data/elementary/themes/edc/efl/button.edc24
-rw-r--r--data/elementary/themes/edc/efl/check.edc16
-rw-r--r--data/elementary/themes/edc/efl/navigation_bar.edc28
-rw-r--r--data/elementary/themes/edc/efl/navigation_layout.edc6
-rw-r--r--data/elementary/themes/edc/efl/popup.edc4
-rw-r--r--data/elementary/themes/edc/efl/progress.edc16
-rw-r--r--data/elementary/themes/edc/efl/radio.edc4
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c37
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c39
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_popup.c4
13 files changed, 113 insertions, 75 deletions
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index ab1045d81f..a665703962 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -24,7 +24,7 @@ group { "efl/bg";
description { state: "default" 0.0;
}
}
- part { name: "efl.bg"; type: SWALLOW;
+ part { name: "efl.background"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
@@ -43,4 +43,4 @@ group { "efl/bg";
}
}
}
-} \ No newline at end of file
+}
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 6927e41878..752c197da4 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -336,7 +336,7 @@ group { name: "efl/button";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "button_text_visible";
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -344,7 +344,7 @@ group { name: "efl/button";
}
}
program { name: "button_text_hidden";
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -352,7 +352,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_visible";
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -360,7 +360,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_hidden";
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@@ -368,7 +368,7 @@ group { name: "efl/button";
}
}
program { name: "button_background_visible";
- signal: "elm,state,efl.background,set"; source: "elm";
+ signal: "elm,state,background,set"; source: "elm";
script {
new m = get_int(btmode);
m |= BACKGROUND; set_int(btmode, m);
@@ -376,7 +376,7 @@ group { name: "efl/button";
}
}
program { name: "button_background_hidden";
- signal: "elm,state,efl.background,unset"; source: "elm";
+ signal: "elm,state,background,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~BACKGROUND; set_int(btmode, m);
@@ -718,7 +718,7 @@ group { name: "efl/button:anchor";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "button_text_visible";
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_text_hidden";
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -734,7 +734,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_visible";
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -742,7 +742,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_hidden";
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@@ -750,12 +750,12 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_background_visible";
- signal: "elm,state,efl.background,set"; source: "elm";
+ signal: "elm,state,background,set"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "efl.background";
}
program { name: "button_background_hidden";
- signal: "elm,state,efl.background,unset"; source: "elm";
+ signal: "elm,state,background,unset"; source: "elm";
action: STATE_SET "default" 0.0;
target: "efl.background";
}
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index cbfa75d509..298458769d 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -271,7 +271,7 @@ group { "efl/check";
target: "indicator";
}
program {
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -279,7 +279,7 @@ group { "efl/check";
}
}
program {
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -287,7 +287,7 @@ group { "efl/check";
}
}
program {
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -295,7 +295,7 @@ group { "efl/check";
}
}
program {
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@@ -870,7 +870,7 @@ group { "efl/check:toggle";
target: "glow_but";
}
program {
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -878,7 +878,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -886,7 +886,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -894,7 +894,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index 212ddd8d76..d67a679d31 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -15,7 +15,7 @@ group { "efl/navigation_bar";
desc { "default";
}
}
- swallow { "back_button";
+ swallow { "efl.back_button";
desc { "default";
fixed: 1 0;
min: 0 0;
@@ -32,14 +32,14 @@ group { "efl/navigation_bar";
vis;
}
}
- swallow { "left_content";
+ swallow { "efl.left_content";
desc { "default";
rel.to: "base";
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
}
}
- swallow { "right_content";
+ swallow { "efl.right_content";
desc { "default";
rel.to: "base";
rel1.relative: 1.0 0.0;
@@ -49,23 +49,23 @@ group { "efl/navigation_bar";
spacer { "text_base";
desc { "default";
rel1 {
- to: "back_button";
+ to: "efl.back_button";
relative: 1.0 0.0;
}
rel2 {
- to: "right_content";
+ to: "efl.right_content";
relative: 0.0 1.0;
}
}
desc { "left_content";
inherit: "default";
rel1 {
- to: "left_content";
+ to: "efl.left_content";
relative: 1.0 0.0;
}
}
}
- textblock { "text";
+ textblock { "efl.text";
scale;
desc { "default";
text {
@@ -76,22 +76,22 @@ group { "efl/navigation_bar";
}
programs {
program {
- signal: "elm,state,back_button,visible"; source: "elm";
+ signal: "elm,state,back_button,set"; source: "elm";
action: STATE_SET "visible" 0.0;
- target: "back_button";
+ target: "efl.back_button";
}
program {
- signal: "elm,state,back_button,hidden"; source: "elm";
+ signal: "elm,state,back_button,unset"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "back_button";
+ target: "efl.back_button";
}
program {
- signal: "elm,state,left_content,visible"; source: "elm";
+ signal: "elm,state,left_content,set"; source: "elm";
action: STATE_SET "left_content" 0.0;
target: "text_base";
}
program {
- signal: "elm,state,left_content,hidden"; source: "elm";
+ signal: "elm,state,left_content,unset"; source: "elm";
action: STATE_SET "default" 0.0;
target: "text_base";
}
@@ -104,7 +104,7 @@ group { name: "efl/navigation_bar/back_button";
images.image: "icon_arrow_left.png" COMP;
parts {
image { name: "icon_arrow_left";
- insert_before: "elm.swallow.content";
+ insert_before: "efl.content";
desc { "default";
image.normal: "icon_arrow_left.png";
fill.smooth: 0;
diff --git a/data/elementary/themes/edc/efl/navigation_layout.edc b/data/elementary/themes/edc/efl/navigation_layout.edc
index c3765cce9f..4319453b96 100644
--- a/data/elementary/themes/edc/efl/navigation_layout.edc
+++ b/data/elementary/themes/edc/efl/navigation_layout.edc
@@ -5,7 +5,7 @@ group { "efl/navigation_layout";
desc { "default";
}
}
- swallow { "bar";
+ swallow { "efl.bar";
desc { "default";
fixed: 0 1;
min: 0 40;
@@ -13,11 +13,11 @@ group { "efl/navigation_layout";
align: 0.5 0.0;
}
}
- swallow { "content";
+ swallow { "efl.content";
desc { "default";
rel1 {
to_x: "base";
- to_y: "bar";
+ to_y: "efl.bar";
relative: 0.0 1.0;
}
rel2.to_x: "base";
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 2ffca4cd5a..cfdd560c37 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -150,13 +150,13 @@ group { "efl/popup/backwall";
programs {
program {
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
action: STATE_SET "content_visible" 0.0;
target: "base";
target: "efl.content";
}
program {
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
target: "efl.content";
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index 37efd3e8ee..d525ba5cd4 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -504,7 +504,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -520,7 +520,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-visible";
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -528,7 +528,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-hidden";
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@@ -1077,7 +1077,7 @@ group { "efl/progressbar/vertical";
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -1093,7 +1093,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-visible";
- signal: "elm,state,efl.content,set"; source: "elm";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -1101,7 +1101,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-hidden";
- signal: "elm,state,efl.content,unset"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index c407713f04..7822d8f14a 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -237,7 +237,7 @@ group { "efl/radio";
target: "indicator";
}
program {
- signal: "elm,state,efl.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -245,7 +245,7 @@ group { "efl/radio";
}
}
program {
- signal: "elm,state,efl.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c
index 43b73ecd6c..af905c8e38 100644
--- a/src/lib/elementary/efl_ui_bg_widget.c
+++ b/src/lib/elementary/efl_ui_bg_widget.c
@@ -56,7 +56,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd)
pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE),
- efl_content_set(efl_part(obj, "efl.bg"), efl_added));
+ efl_content_set(efl_part(obj, "efl.background"), efl_added));
}
pd->file = NULL;
pd->key = NULL;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index ed93cf2e7a..536d504c04 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -204,11 +204,20 @@ _icon_signal_emit(Efl_Ui_Layout_Data *sd,
}
}
- if (elm_widget_is_legacy(sd->obj) &&
- !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
- type = sub_d->part + strlen("elm.swallow.");
+ 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);
@@ -239,10 +248,20 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd,
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.");
+ 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);
@@ -2183,8 +2202,8 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
if (eina_streq(part, "background"))
{
- if (efl_layout_group_part_exist_get(wd->resize_obj, part))
- type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, part));
+ if (efl_layout_group_part_exist_get(wd->resize_obj, "efl.background"))
+ type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, "efl.background"));
if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW)
{
if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST &&
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 911f3386ef..2087fa7b6f 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 \
@@ -71,17 +71,29 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
if (eina_streq(part, "left_content"))
{
if (content)
- efl_layout_signal_emit(obj, "elm,state,left_content,visible", "elm");
+ efl_layout_signal_emit(obj, "elm,state,left_content,set", "elm");
else
- efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
+ efl_layout_signal_emit(obj, "elm,state,left_content,unset", "elm");
efl_layout_signal_process(obj, EINA_FALSE);
+
+ return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content);
+ }
+ else if (eina_streq(part, "right_content"))
+ {
+ return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"), content);
}
+
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
}
static Efl_Gfx *
_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
{
+ if (eina_streq(part, "left_content"))
+ return efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
+ else if (eina_streq(part, "right_content"))
+ return efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
+
return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
}
@@ -90,9 +102,16 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
{
if (eina_streq(part, "left_content"))
{
- efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
+ efl_layout_signal_emit(obj, "elm,state,left_content,unset", "elm");
efl_layout_signal_process(obj, EINA_FALSE);
+
+ return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
}
+ 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));
}
@@ -119,16 +138,16 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd E
if (visible)
{
- if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"), ppd->back_button))
+ if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button))
ERR("Part for back button(i.e. \"back_button\") does not exist!");
else
- efl_layout_signal_emit(pd->obj, "elm,state,back_button,visible", "elm");
+ efl_layout_signal_emit(pd->obj, "elm,state,back_button,set", "elm");
}
else
{
efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"));
efl_gfx_visible_set(ppd->back_button, visible);
- efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm");
+ efl_layout_signal_emit(pd->obj, "elm,state,back_button,unset", "elm");
}
efl_layout_signal_process(pd->obj, EINA_FALSE);
@@ -172,7 +191,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_
efl_event_callback_add(content, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
ppd->back_button = content;
- return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content);
+ return _efl_ui_navigation_bar_content_set(pd->obj, ppd, "efl.back_button", content);
}
static Efl_Gfx*
@@ -181,7 +200,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, v
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL);
- return _efl_ui_navigation_bar_content_get(pd->obj, ppd, pd->part);
+ return _efl_ui_navigation_bar_content_get(pd->obj, ppd, "efl.back_button");
}
static Efl_Gfx*
@@ -193,7 +212,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void
efl_event_callback_del(ppd->back_button, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
ppd->back_button = NULL;
- return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part);
+ return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, "efl.back_button");
}
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_navigation_bar, EFL_UI_NAVIGATION_BAR, Efl_Ui_Navigation_Bar_Data)
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index 3d280dc528..034a768276 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -16,7 +16,7 @@ _efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Ef
{
EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS));
- efl_content_set(efl_part(obj, "bar"), bar);
+ efl_content_set(efl_part(obj, "efl.bar"), bar);
pd->bar = bar;
}
@@ -49,7 +49,7 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
}
/* Standard widget overrides */
-ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "content")
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "efl.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_layout, Efl_Ui_Navigation_Layout_Data)
/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 973d09d8d9..ee96f8980e 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -367,7 +367,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "efl.content");
if (prev_obj)
{
- edje_object_signal_emit(sd->backwall, "elm,state,efl.content,unset", "elm");
+ edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
edje_object_part_unswallow(sd->backwall, prev_obj);
efl_del(prev_obj);
}
@@ -380,7 +380,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
return EINA_FALSE;
}
edje_object_part_swallow(sd->backwall, "efl.content", image);
- edje_object_signal_emit(sd->backwall, "elm,state,efl.content,set", "elm");
+ edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
return EINA_TRUE;
}