From d0557a5a41a64ed12c83a2f153d79ba639596678 Mon Sep 17 00:00:00 2001 From: Jonathan Atton Date: Thu, 15 Jul 2010 17:41:19 +0000 Subject: [PATCH] Elm_Slideshow: Fix the edje, I hope this time it is correct Elm_Notify: set orient = -1, else the default orientation (0) will be not set because the orient does not change (see the test in elm_notify_orient_set()) SVN revision: 50270 --- data/themes/default.edc | 763 +++++++++++++++--------------------------------- src/lib/elm_notify.c | 1 + 2 files changed, 233 insertions(+), 531 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 00b879e..3eb8309 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -8497,206 +8497,10 @@ collections { } /////////////////////////////////////////////////////////////////////////////// -#define elm_slideshow_item_add(id) \ - part { name: "image_"id"_1_whole"; \ - description { \ - state: "default" 0.0; \ - color: 255 255 255 255; \ - rel1.to: "position_"id; \ - rel2.to: "position_"id; \ - } \ - description { \ - state: "fade_prev_next" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 0; \ - } \ - description { \ - state: "black_fade_prev_next_init" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "black_fade_prev_next" 0.0; \ - inherit: "default" 0.0; \ - color: 0 0 0 255; \ - } \ - description { \ - state: "horizontal_next_init" 0.0; \ - inherit: "default" 0.0; \ - } \ - description { \ - state: "horizontal_next" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: -1.0 0.0; \ - rel2.relative: 0.0 1.0; \ - } \ - description { \ - state: "horizontal_prev_init" 0.0; \ - inherit: "default" 0.0; \ - } \ - description { \ - state: "horizontal_prev" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 1.0 0.0; \ - rel2.relative: 2.0 1.0; \ - } \ - description { \ - state: "vertical_next_init" 0.0; \ - inherit: "default" 0.0; \ - } \ - description { \ - state: "vertical_next" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.0 -1.0; \ - rel2.relative: 1.0 0.0; \ - } \ - description { \ - state: "vertical_prev_init" 0.0; \ - inherit: "default" 0.0; \ - } \ - description { \ - state: "vertical_prev" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.0 1.0; \ - rel2.relative: 1.0 2.0; \ - } \ - } \ - part { name: "image_"id"_2_whole"; \ - description { \ - state: "default" 0.0; \ - visible: 1; \ - color: 255 255 255 0; \ - rel1.to: "position_"id; \ - rel2.to: "position_"id; \ - } \ - description { \ - state: "fade_prev_next" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "black_fade_prev_next_init" 0.0; \ - inherit: "default" 0.0; \ - color: 0 0 0 0; \ - } \ - description { \ - state: "black_fade_prev_next" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "horizontal_next_init" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 1.0 0.0; \ - rel2.relative: 2.0 1.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "horizontal_next" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "horizontal_prev_init" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: -1.0 0.0; \ - rel2.relative: 0.0 1.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "horizontal_prev" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "vertical_next_init" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.0 1.0; \ - rel2.relative: 1.0 2.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "vertical_next" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "vertical_prev_init" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.0 -1.0; \ - rel2.relative: 1.0 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "vertical_prev" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "square_prev_next_init" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.5 0.5; \ - rel2.relative: 0.5 0.5; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "square_prev_next" 0.0; \ - inherit: "default" 0.0; \ - rel1.relative: 0.0 0.0; \ - rel2.relative: 1.0 1.0; \ - color: 255 255 255 255; \ - } \ - } \ - part { name: "elm.swallow."id".1"; \ - type: SWALLOW; \ - clip_to: "image_"id"_1_whole"; \ - description { \ - state: "default" 0.0; \ - rel1.to: "image_"id"_1_whole"; \ - rel2.to: "image_"id"_1_whole"; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "not_fullscreen" 0.0; \ - rel1.relative: 0.1 0.1; \ - rel1.to: "image_"id"_1_whole"; \ - rel2.relative: 0.9 0.9; \ - rel2.to: "image_"id"_1_whole"; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "expose" 0.0; \ - inherit: "default" 0.0; \ - } \ - } \ - part { name: "elm.swallow."id".2"; \ - type: SWALLOW; \ - clip_to: "image_"id"_2_whole"; \ - description { \ - state: "default" 0.0; \ - color: 255 255 255 255; \ - rel1.to: "image_"id"_2_whole"; \ - rel2.to: "image_"id"_2_whole"; \ - } \ - description { \ - state: "not_fullscreen" 0.0; \ - color: 255 255 255 255; \ - rel1.relative: 0.1 0.1; \ - rel1.to: "image_"id"_2_whole"; \ - rel2.relative: 0.9 0.9; \ - rel2.to: "image_"id"_2_whole"; \ - } \ - description { \ - state: "expose" 0.0; \ - inherit: "default" 0.0; \ - } \ - } - group { name: "elm/slideshow/base/default"; data { item: transitions "fade black_fade horizontal vertical square"; - item: layouts "fullscreen not_fullscreen expose"; - item: expose 2; + item: layouts "fullscreen not_fullscreen"; } parts { part { name: "whole"; @@ -8707,100 +8511,192 @@ collections { color: 20 20 20 255; } } - part { name: "position_0"; - description { - state: "default" 0.0; - } - description { - state: "not_fullscreen" 0.0; - inherit: "default" 0.0; - } - description { - state: "expose" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.4 0.4; - rel2.relative: 0.6 0.6; - } + part { name: "image_1_whole"; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "fade_prev_next" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + } + description { + state: "black_fade_prev_next_init" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "black_fade_prev_next" 0.0; + inherit: "default" 0.0; + color: 0 0 0 255; + } + description { + state: "horizontal_next_init" 0.0; + inherit: "default" 0.0; + } + description { + state: "horizontal_next" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + } + description { + state: "horizontal_prev_init" 0.0; + inherit: "default" 0.0; + } + description { + state: "horizontal_prev" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + } + description { + state: "vertical_next_init" 0.0; + inherit: "default" 0.0; + } + description { + state: "vertical_next" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 -1.0; + rel2.relative: 1.0 0.0; + } + description { + state: "vertical_prev_init" 0.0; + inherit: "default" 0.0; + } + description { + state: "vertical_prev" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 2.0; + } description { state: "square_prev_next" 0.0; inherit: "default" 0.0; color: 255 255 255 0; - } - } - part { name: "position_-2"; - description { - state: "default" 0.0; - rel1.relative: 0.0 1.0; - rel2.relative: 0.2 1.2; - } - description { - state: "not_fullscreen" 0.0; - inherit: "default" 0.0; - } - description { - state: "expose" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.0 0.4; - rel2.relative: 0.2 0.6; - } - } - part { name: "position_-1"; - description { - state: "default" 0.0; - rel1.relative: 0.2 -0.2; - rel2.relative: 0.4 0.0; - } - description { - state: "not_fullscreen" 0.0; - inherit: "default" 0.0; - } - description { - state: "expose" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.2 0.4; - rel2.relative: 0.4 0.6; - } - } - part { name: "position_1"; - description { - state: "default" 0.0; - rel1.relative: 0.6 1.0; - rel2.relative: 0.8 1.2; - } - description { - state: "not_fullscreen" 0.0; - inherit: "default" 0.0; - } - description { - state: "expose" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.6 0.4; - rel2.relative: 0.8 0.6; - } - } - part { name: "position_2"; - description { - state: "default" 0.0; - rel1.relative: 0.8 -0.2; - rel2.relative: 1.0 0.0; - } - description { - state: "not_fullscreen" 0.0; - inherit: "default" 0.0; - } - description { - state: "expose" 0.0; - inherit: "default" 0.0; - rel1.relative: 0.8 0.4; - rel2.relative: 1.0 0.6; - } - } - elm_slideshow_item_add(-2); - elm_slideshow_item_add(-1); - elm_slideshow_item_add(0); - elm_slideshow_item_add(1); - elm_slideshow_item_add(2); - + } + } + part { name: "image_2_whole"; + description { + state: "default" 0.0; + visible: 1; + color: 255 255 255 0; + } + description { + state: "fade_prev_next" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "black_fade_prev_next_init" 0.0; + inherit: "default" 0.0; + color: 0 0 0 0; + } + description { + state: "black_fade_prev_next" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "horizontal_next_init" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 2.0 1.0; + color: 255 255 255 255; + } + description { + state: "horizontal_next" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "horizontal_prev_init" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 0.0; + rel2.relative: 0.0 1.0; + color: 255 255 255 255; + } + description { + state: "horizontal_prev" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "vertical_next_init" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 2.0; + color: 255 255 255 255; + } + description { + state: "vertical_next" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "vertical_prev_init" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 -1.0; + rel2.relative: 1.0 0.0; + color: 255 255 255 255; + } + description { + state: "vertical_prev" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "square_prev_next_init" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; + color: 255 255 255 255; + } + description { + state: "square_prev_next" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + color: 255 255 255 255; + } + } + part { name: "elm.swallow.1"; + type: SWALLOW; + clip_to: "image_1_whole"; + description { + state: "default" 0.0; + rel1.to: "image_1_whole"; + rel2.to: "image_1_whole"; + color: 255 255 255 255; + } + description { + state: "not_fullscreen" 0.0; + rel1.relative: 0.1 0.1; + rel1.to: "image_1_whole"; + rel2.relative: 0.9 0.9; + rel2.to: "image_1_whole"; + color: 255 255 255 255; + } + } + part { name: "elm.swallow.2"; + type: SWALLOW; + clip_to: "image_2_whole"; + description { + state: "default" 0.0; + color: 255 255 255 255; + rel1.to: "image_2_whole"; + rel2.to: "image_2_whole"; + } + description { + state: "not_fullscreen" 0.0; + color: 255 255 255 255; + rel1.relative: 0.1 0.1; + rel1.to: "image_2_whole"; + rel2.relative: 0.9 0.9; + rel2.to: "image_2_whole"; + } + } part { name: "events_catcher"; type: RECT; repeat_events: 1; @@ -8812,99 +8708,36 @@ collections { } } programs { - //Layout - program { name: "layout_fullscreen"; + //Substyle + program { name: "layout_fullscreen"; signal: "layout,fullscreen"; source: "slideshow"; action: STATE_SET "default" 0.0; - target: "elm.swallow.0.1"; - target: "elm.swallow.0.2"; - target: "elm.swallow.-1.1"; - target: "elm.swallow.-1.2"; - target: "elm.swallow.1.1"; - target: "elm.swallow.1.2"; - target: "elm.swallow.-2.1"; - target: "elm.swallow.-2.2"; - target: "elm.swallow.2.1"; - target: "elm.swallow.2.2"; - target: "position_0"; - target: "position_-1"; - target: "position_1"; - target: "position_-2"; - target: "position_2"; + target: "elm.swallow.1"; + target: "elm.swallow.2"; transition: SINUSOIDAL 1.0; - } - program { name: "layout_not_fullscreen"; + } + program { name: "layout_not_fullscreen"; signal: "layout,not_fullscreen"; source: "slideshow"; action: STATE_SET "not_fullscreen" 0.0; - target: "elm.swallow.0.1"; - target: "elm.swallow.0.2"; - target: "elm.swallow.-1.1"; - target: "elm.swallow.-1.2"; - target: "elm.swallow.1.1"; - target: "elm.swallow.1.2"; - target: "elm.swallow.-2.1"; - target: "elm.swallow.-2.2"; - target: "elm.swallow.2.1"; - target: "elm.swallow.2.2"; - target: "position_0"; - target: "position_-1"; - target: "position_1"; - target: "position_-2"; - target: "position_2"; - transition: SINUSOIDAL 1.0; - } - program { name: "layout_expose"; - signal: "layout,expose"; - source: "slideshow"; - action: STATE_SET "expose" 0.0; - target: "elm.swallow.0.1"; - target: "elm.swallow.0.2"; - target: "elm.swallow.-1.1"; - target: "elm.swallow.-1.2"; - target: "elm.swallow.1.1"; - target: "elm.swallow.1.2"; - target: "elm.swallow.-2.1"; - target: "elm.swallow.-2.2"; - target: "elm.swallow.2.1"; - target: "elm.swallow.2.2"; - target: "position_0"; - target: "position_-1"; - target: "position_1"; - target: "position_-2"; - target: "position_2"; + target: "elm.swallow.1"; + target: "elm.swallow.2"; transition: SINUSOIDAL 1.0; - } - // + } + // program { name: "fade_next"; signal: "fade,next"; source: "slideshow"; action: STATE_SET "default" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "fade_next_2"; } program { name: "fade_next_2"; action: STATE_SET "fade_prev_next" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -8912,30 +8745,14 @@ collections { signal: "fade,previous"; source: "slideshow"; action: STATE_SET "default" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "fade_previous_2"; } program { name: "fade_previous_2"; action: STATE_SET "fade_prev_next" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -8943,35 +8760,19 @@ collections { signal: "black_fade,next"; source: "slideshow"; action: STATE_SET "black_fade_prev_next_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "black_fade_next_2"; } program { name: "black_fade_next_2"; action: STATE_SET "black_fade_prev_next" 0.0; - target: "image_0_1_whole"; - target: "image_-1_1_whole"; - target: "image_1_1_whole"; - target: "image_-2_1_whole"; - target: "image_2_1_whole"; + target: "image_1_whole"; transition: SINUSOIDAL 0.75; after: "black_fade_next_3"; } program { name: "black_fade_next_3"; action: STATE_SET "black_fade_prev_next" 0.0; - target: "image_0_2_whole"; - target: "image_-1_2_whole"; - target: "image_1_2_whole"; - target: "image_-2_2_whole"; - target: "image_2_2_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 0.75; after: "end"; } @@ -8979,35 +8780,19 @@ collections { signal: "black_fade,previous"; source: "slideshow"; action: STATE_SET "black_fade_prev_next_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "black_fade_previous_2"; } program { name: "black_fade_previous_2"; action: STATE_SET "black_fade_prev_next" 0.0; - target: "image_0_1_whole"; - target: "image_-1_1_whole"; - target: "image_1_1_whole"; - target: "image_-2_1_whole"; - target: "image_2_1_whole"; + target: "image_1_whole"; transition: SINUSOIDAL 0.75; after: "black_fade_previous_3"; } program { name: "black_fade_previous_3"; action: STATE_SET "black_fade_prev_next" 0.0; - target: "image_0_2_whole"; - target: "image_-1_2_whole"; - target: "image_1_2_whole"; - target: "image_-2_2_whole"; - target: "image_2_2_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 0.75; after: "end"; } @@ -9015,30 +8800,14 @@ collections { signal: "horizontal,next"; source: "slideshow"; action: STATE_SET "horizontal_next_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "horizontal_next_2"; } program { name: "horizontal_next_2"; action: STATE_SET "horizontal_next" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -9046,30 +8815,14 @@ collections { signal: "horizontal,previous"; source: "slideshow"; action: STATE_SET "horizontal_prev_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "horizontal_previous_2"; } program { name: "horizontal_previous_2"; action: STATE_SET "horizontal_prev" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -9077,30 +8830,14 @@ collections { signal: "vertical,next"; source: "slideshow"; action: STATE_SET "vertical_next_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "vertical_next_2"; } program { name: "vertical_next_2"; action: STATE_SET "vertical_next" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -9108,30 +8845,14 @@ collections { signal: "vertical,previous"; source: "slideshow"; action: STATE_SET "vertical_prev_init" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; after: "vertical_previous_2"; } program { name: "vertical_previous_2"; action: STATE_SET "vertical_prev" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; transition: SINUSOIDAL 1.5; after: "end"; } @@ -9139,20 +8860,12 @@ collections { signal: "square,next"; source: "slideshow"; action: STATE_SET "square_prev_next_init" 0.0; - target: "image_0_2_whole"; - target: "image_-1_2_whole"; - target: "image_1_2_whole"; - target: "image_-2_2_whole"; - target: "image_2_2_whole"; + target: "image_2_whole"; after: "square_next_2"; } program { name: "square_next_2"; action: STATE_SET "square_prev_next" 0.0; - target: "image_0_2_whole"; - target: "image_-1_2_whole"; - target: "image_1_2_whole"; - target: "image_-2_2_whole"; - target: "image_2_2_whole"; + target: "image_2_whole"; target: "image_1_whole"; transition: SINUSOIDAL 1.5; after: "end"; @@ -9161,30 +8874,18 @@ collections { signal: "square,previous"; source: "slideshow"; action: STATE_SET "square_prev_next_init" 0.0; - target: "image_0_2_whole"; - target: "image_-1_2_whole"; - target: "image_1_2_whole"; - target: "image_-2_2_whole"; - target: "image_2_2_whole"; + target: "image_2_whole"; after: "square_next_2"; } program { name: "end"; action: SIGNAL_EMIT "end" "slideshow"; } program { name: "end_signal"; - signal: "anim,end"; - source: "slideshow"; + signal: "anim,end"; + source: "slideshow"; action: STATE_SET "default" 0.0; - target: "image_0_1_whole"; - target: "image_0_2_whole"; - target: "image_-1_1_whole"; - target: "image_-1_2_whole"; - target: "image_1_1_whole"; - target: "image_1_2_whole"; - target: "image_-2_1_whole"; - target: "image_-2_2_whole"; - target: "image_2_1_whole"; - target: "image_2_2_whole"; + target: "image_1_whole"; + target: "image_2_whole"; } } } diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c index 512b07c..4aec18e 100644 --- a/src/lib/elm_notify.c +++ b/src/lib/elm_notify.c @@ -316,6 +316,7 @@ elm_notify_add(Evas_Object *parent) wd->repeat_events = EINA_TRUE; wd->notify = edje_object_add(e); + wd->orient = -1; elm_notify_orient_set(obj, ELM_NOTIFY_ORIENT_TOP); elm_notify_parent_set(obj, parent); -- 2.7.4