vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary/naviframe - modified internal signal names. 

this change resolves the transition problem also 
When user set the item style again. 

every time, transition signals are called,
Transition start position of the page will be reset.



SVN revision: 63869
This commit is contained in:
ChunEon Park 2011-10-06 04:59:02 +00:00
parent 9cf1c1a8ad
commit f96f4bbc06
2 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
legacy/elementary/data/themes/widgets/naviframe.edc
View File

@ -81,21 +81,16 @@ group { name:"elm/naviframe/item/basic/default";
clip_to: "content_clip";
description { state: "default" 0.0;
align: 0.0 0.0;
rel1.relative: 1.0 1.0;
rel1.to_y: "title_clip";
rel2.relative: 2.0 1.0;
}
description { state: "show" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.to_y: "title_clip";
rel2.relative: 1.0 1.0;
}
description { state: "pushed" 0.0;
description { state: "left" 0.0;
inherit: "default" 0.0;
rel1.relative: -1.0 1.0;
rel2.relative: 0.0 1.0;
}
description { state: "popped" 0.0;
description { state: "right" 0.0;
inherit: "default" 0.0;
rel1.relative: 1.0 1.0;
rel2.relative: 2.0 1.0;
@ -218,30 +213,70 @@ group { name:"elm/naviframe/item/basic/default";
}
}
programs {
program { name: "show";
signal: "elm,state,show";
source: "elm";
action: STATE_SET "show" 0.0;
target: "elm.swallow.content";
program { name: "content_new_pusehd";
signal: "elm,state,new,pushed,internal";
source: "";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "elm.swallow.content";
after: "show_finished";
}
program { name: "pushed";
signal: "elm,state,pushed";
source: "elm";
action: STATE_SET "pushed" 0.0;
program { name: "content_cur_pusehd";
signal: "elm,state,cur,pushed,internal";
source: "";
action: STATE_SET "left" 0.0;
target: "elm.swallow.content";
transition: DECELERATE 0.5;
after: "pushed_finished";
}
program { name: "popped";
signal: "elm,state,popped";
source: "elm";
action: STATE_SET "popped" 0.0;
program { name: "content_prev_popped";
signal: "elm,state,prev,popped,internal";
source: "";
action: STATE_SET "default" 0.0;
target: "elm.swallow.content";
transition: DECELERATE 0.5;
after: "show_finished";
}
program { name: "content_cur_popped";
signal: "elm,state,cur,popped,internal";
source: "";
action: STATE_SET "right" 0.0;
target: "elm.swallow.content";
transition: DECELERATE 0.5;
after: "popped_finished";
}
program { name: "cur_pushed";
signal: "elm,state,cur,pushed";
source: "elm";
script {
set_state(PART:"elm.swallow.content", "default", 0.0);
emit("elm,state,cur,pushed,internal", "");
}
}
program { name: "new_pushed";
signal: "elm,state,new,pushed";
source: "elm";
script {
set_state(PART:"elm.swallow.content", "right", 0.0);
emit("elm,state,new,pushed,internal", "");
}
}
program { name: "prev_popped";
signal: "elm,state,prev,popped";
source: "elm";
script {
set_state(PART:"elm.swallow.content", "left", 0.0);
emit("elm,state,prev,popped,internal", "");
}
}
program { name: "cur_popped";
signal: "elm,state,cur,popped";
source: "elm";
script {
set_state(PART:"elm.swallow.content", "default", 0.0);
emit("elm,state,cur,popped,internal", "");
}
}
program { name: "visible";
signal: "elm,state,visible";
source: "elm";

14
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -841,10 +841,10 @@ elm_naviframe_item_push(Evas_Object *obj,
evas_object_pass_events_set(wd->base, EINA_TRUE);
}
edje_object_signal_emit(prev_it->base.view,
"elm,state,pushed",
"elm,state,cur,pushed",
"elm");
edje_object_signal_emit(it->base.view,
"elm,state,show",
"elm,state,new,pushed",
"elm");
}
else
@ -881,11 +881,11 @@ elm_naviframe_item_pop(Evas_Object *obj)
//FIXME:
evas_object_pass_events_set(wd->base, EINA_TRUE);
}
edje_object_signal_emit(it->base.view, "elm,state,popped", "elm");
edje_object_signal_emit(it->base.view, "elm,state,cur,popped", "elm");
evas_object_show(prev_it->base.view);
evas_object_raise(prev_it->base.view);
edje_object_signal_emit(prev_it->base.view,
"elm,state,show",
"elm,state,prev,popped",
"elm");
}
else
@ -968,10 +968,8 @@ elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
else
{
if (strlen(item_style) > sizeof(buf))
WRN("too much long style name! : naviframe=%p",
navi_it->base.widget);
else
sprintf(buf, "item/%s", item_style);
WRN("too much long style name! : naviframe=%p", navi_it->base.widget);
sprintf(buf, "item/%s", item_style);
}
_elm_theme_object_set(navi_it->base.widget,
navi_it->base.view,