davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5e493a0851780ca42393976e24ed57c80e4d2644
commit 5e493a0851780ca42393976e24ed57c80e4d2644 Author: davemds <[email protected]> Date: Sun Feb 16 16:00:20 2014 +0100 Emotion test: add the volume slider also to the Reflex group. NOTE: do we really need to maintain 2 different groups for the reflex effect? The 2 groups differ only for the added reflection part. Isn't enough to show/hide the reflection part when requested? --- src/tests/emotion/data/theme.edc | 65 +++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc index c4ba3ac..7172232 100644 --- a/src/tests/emotion/data/theme.edc +++ b/src/tests/emotion/data/theme.edc @@ -1070,11 +1070,13 @@ collections { // // need txt parts: // "video_alpha_txt" + // "video_volume_txt" // "video_progress_txt" // // need dragables: // "video_progress" horizontal // "video_alpha" vertical + // "video_volume" vertical part { name: "video_swallow"; mouse_events: 0; type: SWALLOW; description { state: "default" 0.0; rel1 { @@ -1198,23 +1200,35 @@ collections { part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0; description { state: "default" 0.0; rel1 { - to: "video_frame_bottom"; - relative: 0.0 0.0; - offset: 0 8; + to: "video_frame_top"; } rel2 { - to: "video_frame_bottom"; - relative: 1.0 1.0; - offset: -1 -13; + to: "video_frame_top"; } color: 0 0 0 255; text { font: "Sans"; - size: 6; + size: 8; align: 1.0 0.5; }; } } + part { name: "video_volume_txt"; type: TEXT; mouse_events: 0; + description { state: "default" 0.0; + rel1 { + to: "video_frame_top"; + } + rel2 { + to: "video_frame_top"; + } + color: 0 0 0 255; + text { + font: "Sans"; + size: 8; + align: 0.0 0.5; + }; + } + } part { name: "video_progress_confine"; mouse_events: 0; type: RECT; description { state: "default" 0.0; fixed: 1 1; @@ -1313,6 +1327,43 @@ collections { } } } + part { name: "video_volume_confine"; mouse_events: 0; type: RECT; + description { state: "default" 0.0; + rel1 { + to: "video_frame_left"; + offset: 10 24; + } + rel2 { + to: "video_frame_left"; + offset: 0 -48; + } + color: 0 0 0 0; + } + } + part { name: "video_volume"; mouse_events: 1; + dragable { + x: 0 0 0; + y: -1 1 0; + confine: "video_volume_confine"; + } + description { state: "default" 0.0; + fixed: 1 1; + min: 24 24; + rel1 { + to: "video_volume_confine"; + relative: 0.5 0.5; + offset: 0 0; + } + rel2 { + to: "video_volume_confine"; + relative: 0.5 0.5; + offset: 0 0; + } + image { + normal: "knob.png"; + } + } + } part { name: "video_play"; mouse_events: 1; description { state: "default" 0.0; fixed: 1 1; --
