enjoy: better page switch effect, remove cruft.
SVN revision: 62767
This commit is contained in:
Gustavo Sverzut Barbieri
parent
44bcecdb2f
commit
a99603bb29
|
|
@ -735,489 +735,6 @@ collections {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: taken from eve edc but not perfect yet
|
||||
* Add fade effects for show and hide signals
|
||||
*/
|
||||
group { name: "elm/scroller/base/enjoy";
|
||||
alias: "elm/list/base/enjoy";
|
||||
alias: "elm/carousel/base/enjoy";
|
||||
alias: "elm/gengrid/base/enjoy";
|
||||
images {
|
||||
image: "scrollbar-knob.png" COMP;
|
||||
image: "scrollbar-bg.png" COMP;
|
||||
}
|
||||
script {
|
||||
public sbvis_v, sbvis_h, sbalways_v, sbalways_h;
|
||||
}
|
||||
parts {
|
||||
part { name: "bg";
|
||||
type: RECT;
|
||||
description { state: "default" 0.0;
|
||||
//rel1.offset: 1 1;
|
||||
//rel2.offset: -2 -2;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
part { name: "clipper";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "bg";
|
||||
rel2.to: "bg";
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
clip_to: "clipper";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
//rel1.offset: 1 1;
|
||||
//rel2.offset: -2 -2;
|
||||
}
|
||||
}
|
||||
part { name: "conf_over";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 0 0;
|
||||
rel2.offset: -1 -1;
|
||||
}
|
||||
}
|
||||
part { name: "sb_vbar_clip_master";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
visible: 0;
|
||||
color: 255 255 255 0;
|
||||
}
|
||||
}
|
||||
part { name: "sb_vbar_clip";
|
||||
clip_to: "sb_vbar_clip_master";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
visible: 0;
|
||||
color: 255 255 255 0;
|
||||
}
|
||||
}
|
||||
part { name: "sb_vbar";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
min: 2 32;
|
||||
align: 1.0 0.0;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
offset: -8 25;
|
||||
}
|
||||
rel2 {
|
||||
relative: 1.0 0.0;
|
||||
offset: -7 -7;
|
||||
to_y: "sb_hbar";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "sb_vbar_runner";
|
||||
clip_to: "sb_vbar_clip";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
min: 3 3;
|
||||
max: 3 99999;
|
||||
rel1.to: "sb_vbar";
|
||||
rel2.to: "sb_vbar";
|
||||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
part { name: "vknob-bg";
|
||||
type: IMAGE;
|
||||
mouse_events: 0;
|
||||
clip_to: sb_vbar_clip;
|
||||
description { state: "default" 0.0;
|
||||
image.normal: "scrollbar-bg.png";
|
||||
image.border: 1 1 3 2;
|
||||
max: 3 99999;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
offset: -10 25;
|
||||
}
|
||||
rel2 {
|
||||
relative: 1.0 1.0;
|
||||
offset: -6 -25;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.vbar";
|
||||
clip_to: "sb_vbar_clip";
|
||||
mouse_events: 0;
|
||||
dragable {
|
||||
x: 0 0 0;
|
||||
y: 1 1 0;
|
||||
confine: "sb_vbar";
|
||||
}
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
min: 2 12;
|
||||
rel1 {
|
||||
relative: 1.0 0.5;
|
||||
offset: -3 0;
|
||||
to: "sb_vbar";
|
||||
}
|
||||
rel2 {
|
||||
relative: 1.0 0.5;
|
||||
offset: -1 0;
|
||||
to: "sb_vbar";
|
||||
}
|
||||
image {
|
||||
normal: "scrollbar-knob.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar_clip_master";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
visible: 0;
|
||||
color: 255 255 255 0;
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar_clip";
|
||||
clip_to: "sb_hbar_clip_master";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
visible: 0;
|
||||
color: 255 255 255 0;
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
min: 17 17;
|
||||
align: 0.0 1.0;
|
||||
rel1 {
|
||||
relative: 0.0 1.0;
|
||||
offset: 0 -2;
|
||||
}
|
||||
rel2 {
|
||||
relative: 0.0 1.0;
|
||||
offset: -1 -2;
|
||||
to_x: "sb_vbar";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar_runner";
|
||||
clip_to: "sb_hbar_clip";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
min: 3 3;
|
||||
max: 99999 3;
|
||||
rel1.to: "sb_hbar";
|
||||
rel2.to: "sb_hbar";
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.hbar";
|
||||
clip_to: "sb_hbar_clip";
|
||||
mouse_events: 0;
|
||||
dragable {
|
||||
x: 1 1 0;
|
||||
y: 0 0 0;
|
||||
confine: "sb_hbar";
|
||||
}
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
min: 17 17;
|
||||
rel1 {
|
||||
relative: 0.5 0.5;
|
||||
offset: 0 0;
|
||||
to: "sb_hbar";
|
||||
}
|
||||
rel2 {
|
||||
relative: 0.5 0.5;
|
||||
offset: 0 0;
|
||||
to: "sb_hbar";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar_over1";
|
||||
clip_to: "sb_hbar_clip";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel2.relative: 1.0 0.5;
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
}
|
||||
}
|
||||
part { name: "sb_hbar_over2";
|
||||
clip_to: "sb_hbar_clip";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "load";
|
||||
signal: "load";
|
||||
source: "";
|
||||
script {
|
||||
set_state(PART:"sb_hbar_clip", "hidden", 0.0);
|
||||
set_state(PART:"sb_vbar_clip", "hidden", 0.0);
|
||||
set_int(sbvis_h, 0);
|
||||
set_int(sbalways_v, 0);
|
||||
set_int(sbalways_h, 0);
|
||||
|
||||
emit("do-show-vbar", "");
|
||||
set_int(sbvis_v, 1);
|
||||
}
|
||||
}
|
||||
|
||||
program { name: "vbar_show";
|
||||
signal: "elm,action,show,vbar";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "sb_vbar_clip_master";
|
||||
}
|
||||
program { name: "vbar_hide";
|
||||
signal: "elm,action,hide,vbar";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "sb_vbar_clip_master";
|
||||
}
|
||||
program { name: "vbar_show_always";
|
||||
signal: "elm,action,show_always,vbar";
|
||||
source: "elm";
|
||||
script {
|
||||
new v;
|
||||
v = get_int(sbvis_v);
|
||||
v |= get_int(sbalways_v);
|
||||
if (!v) {
|
||||
set_int(sbalways_v, 1);
|
||||
emit("do-show-vbar", "");
|
||||
set_int(sbvis_v, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
program { name: "vbar_show_notalways";
|
||||
signal: "elm,action,show_notalways,vbar";
|
||||
source: "elm";
|
||||
script {
|
||||
new v;
|
||||
v = get_int(sbalways_v);
|
||||
if (v) {
|
||||
set_int(sbalways_v, 0);
|
||||
v = get_int(sbvis_v);
|
||||
if (!v) {
|
||||
emit("do-hide-vbar", "");
|
||||
set_int(sbvis_v, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
program { name: "sb_vbar_show";
|
||||
signal: "do-show-vbar";
|
||||
source: "";
|
||||
action: STATE_SET "default" 0.0;
|
||||
transition: LINEAR 1.0;
|
||||
target: "sb_vbar_clip";
|
||||
}
|
||||
program { name: "sb_vbar_hide";
|
||||
signal: "do-hide-vbar";
|
||||
source: "";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
transition: LINEAR 1.0;
|
||||
target: "sb_vbar_clip";
|
||||
}
|
||||
|
||||
program { name: "hbar_show";
|
||||
signal: "elm,action,show,hbar";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "sb_hbar_clip_master";
|
||||
}
|
||||
program { name: "hbar_hide";
|
||||
signal: "elm,action,hide,hbar";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "sb_hbar_clip_master";
|
||||
}
|
||||
program { name: "hbar_show_always";
|
||||
signal: "elm,action,show_always,hbar";
|
||||
source: "elm";
|
||||
script {
|
||||
new v;
|
||||
v = get_int(sbvis_h);
|
||||
v |= get_int(sbalways_h);
|
||||
if (!v) {
|
||||
set_int(sbalways_h, 1);
|
||||
emit("do-show-hbar", "");
|
||||
set_int(sbvis_h, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
program { name: "hbar_show_notalways";
|
||||
signal: "elm,action,show_notalways,hbar";
|
||||
source: "elm";
|
||||
script {
|
||||
new v;
|
||||
v = get_int(sbalways_h);
|
||||
if (v) {
|
||||
set_int(sbalways_h, 0);
|
||||
v = get_int(sbvis_h);
|
||||
if (!v) {
|
||||
emit("do-hide-hbar", "");
|
||||
set_int(sbvis_h, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
program { name: "sb_hbar_show";
|
||||
signal: "do-show-hbar";
|
||||
source: "";
|
||||
action: STATE_SET "default" 0.0;
|
||||
transition: LINEAR 1.0;
|
||||
target: "sb_hbar_clip";
|
||||
}
|
||||
program { name: "sb_hbar_hide";
|
||||
signal: "do-hide-hbar";
|
||||
source: "";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
transition: LINEAR 1.0;
|
||||
target: "sb_hbar_clip";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
group { name: "elm/pager/base/default";
|
||||
data.item: "onshow" "raise";
|
||||
parts {
|
||||
part { name: "clip";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1 {
|
||||
to: "base";
|
||||
offset: -9999 -9999;
|
||||
}
|
||||
rel2 {
|
||||
to: "base";
|
||||
offset: 9999 9999;
|
||||
}
|
||||
color: 255 255 255 255;
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 255 255 255 0;
|
||||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "base";
|
||||
mouse_events: 0;
|
||||
clip_to: "clip";
|
||||
description { state: "default" 0.0; }
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1.relative: -1.0 0.0;
|
||||
rel2.relative: 0.0 1.0;
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel2.relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
type: SWALLOW;
|
||||
clip_to: "clip";
|
||||
description { state: "default" 0.0;
|
||||
rel1 {
|
||||
to: "base";
|
||||
offset: 0 0;
|
||||
}
|
||||
rel2 {
|
||||
to: "base";
|
||||
offset: -1 -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "push_start";
|
||||
signal: "elm,action,push";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "show_start2";
|
||||
}
|
||||
program { name: "show_start";
|
||||
signal: "elm,action,show";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "show_start2";
|
||||
}
|
||||
program { name: "show_start2";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "show_end";
|
||||
}
|
||||
program { name: "show_end";
|
||||
action: SIGNAL_EMIT "elm,action,show,finished" "";
|
||||
}
|
||||
program { name: "pop_start";
|
||||
signal: "elm,action,pop";
|
||||
source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "hide_start2";
|
||||
}
|
||||
program { name: "hide_start";
|
||||
signal: "elm,action,hide";
|
||||
source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "hide_start2";
|
||||
}
|
||||
program { name: "hide_start2";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
after: "hide_end";
|
||||
}
|
||||
program { name: "hide_end";
|
||||
action: SIGNAL_EMIT "elm,action,hide,finished" "";
|
||||
}
|
||||
program { name: "reset";
|
||||
signal: "elm,action,reset";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "base";
|
||||
target: "clip";
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "group_rating_stars";
|
||||
min: RATING_STARS_WIDTH RATING_STARS_HEIGHT;
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ list_add(Evas_Object *parent)
|
|||
memset(list, 0, sizeof(list));
|
||||
|
||||
list->pager = elm_pager_add(parent);
|
||||
elm_object_style_set(list->pager, "enjoy");
|
||||
elm_object_style_set(list->pager, "fade");
|
||||
if (!list->pager) return NULL;
|
||||
|
||||
evas_object_data_set(list->pager, "_enjoy_list", list);
|
||||
|
|
|
|||
|
|
@ -326,7 +326,6 @@ _page_add(Evas_Object *parent, void *model, Eina_Iterator *it, const char *title
|
|||
elm_genlist_bounce_set(page->list, EINA_FALSE, EINA_TRUE);
|
||||
elm_genlist_horizontal_mode_set(page->list, ELM_LIST_COMPRESS);
|
||||
elm_genlist_compress_mode_set(page->list, EINA_TRUE);
|
||||
elm_object_style_set(page->list, "enjoy");
|
||||
|
||||
s = edje_object_data_get(page->edje_list, "homogeneous");
|
||||
elm_genlist_homogeneous_set(page->list, s ? !!atoi(s) : EINA_FALSE);
|
||||
|
|
|
|||
Loading…
Reference in New Issue