Menu
▾
▴
E SVN: hermet IN trunk/elementary: data/themes/widgets src/lib
|
From: Enlightenment S. <no-...@en...> - 2011-10-06 04:59:09
|
Log: 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. Author: hermet Date: 2011-10-05 21:59:02 -0700 (Wed, 05 Oct 2011) New Revision: 63869 Trac: http://trac.enlightenment.org/e/changeset/63869 Modified: trunk/elementary/data/themes/widgets/naviframe.edc trunk/elementary/src/lib/elc_naviframe.c Modified: trunk/elementary/data/themes/widgets/naviframe.edc =================================================================== --- trunk/elementary/data/themes/widgets/naviframe.edc 2011-10-06 02:41:24 UTC (rev 63868) +++ trunk/elementary/data/themes/widgets/naviframe.edc 2011-10-06 04:59:02 UTC (rev 63869) @@ -81,21 +81,16 @@ clip_to: "content_clip"; description { state: "default" 0.0; align: 0.0 0.0; - rel1.relative: 1.0 1.0; + rel1.relative: 0.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; 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 @@ } } programs { - program { name: "show"; - signal: "elm,state,show"; - source: "elm"; - action: STATE_SET "show" 0.0; + 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"; - transition: DECELERATE 0.5; 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"; Modified: trunk/elementary/src/lib/elc_naviframe.c =================================================================== --- trunk/elementary/src/lib/elc_naviframe.c 2011-10-06 02:41:24 UTC (rev 63868) +++ trunk/elementary/src/lib/elc_naviframe.c 2011-10-06 04:59:02 UTC (rev 63869) @@ -841,10 +841,10 @@ 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 @@ //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 @@ 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, |