From 5ad05613db1fc3adc4831a9789ac0dc565e4fac3 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 17 Jan 2018 18:12:33 +0900 Subject: [PATCH] efl theme - fix bug in e init splash that would do hide anim 2x this should fix a "go black and stay black for a bit" bug... @fix T6619 --- data/elementary/themes/edc/init.edc | 49 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc index 630b714..630ff20 100644 --- a/data/elementary/themes/edc/init.edc +++ b/data/elementary/themes/edc/init.edc @@ -385,14 +385,13 @@ group { name: "e/init/splash"; } } programs { - program { - signal: "load"; source: ""; + program { signal: "load"; source: ""; script { set_int(is_ready, 0); set_int(do_end, 0); } } - + #define PROG(_NAME) \ program { name: _NAME"0"; \ signal: "show"; source: ""; \ @@ -460,8 +459,7 @@ group { name: "e/init/splash"; PROG("l+3") #undef PROG - program { - signal: "show"; source: ""; + program { signal: "show"; source: ""; action: STATE_SET "visible" 0.0; transition: DECELERATE 1.0; target: "shadow"; @@ -491,19 +489,16 @@ group { name: "e/init/splash"; set_int(is_ready, 1); } } - program { - signal: "e,state,done"; source: "e"; + program { signal: "e,state,done"; source: "e"; script { new val; + set_int(do_end, 1); val = get_int(is_ready); if (val == 1) run_program(PROGRAM:"exit1"); - else - set_int(do_end, 1); } } program { name: "exit1"; - signal: "e,state,done"; source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 1.0 CURRENT; target: "shadow"; @@ -520,6 +515,10 @@ group { name: "e/init/extra_screen"; images.image: "screen_circular_shadow.png" COMP; images.image: "bg_radgrad.png" COMP; images.image: "dot_pattern.png" COMP; + script { + public is_ready; + public do_end; + } parts { part { name: "clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; @@ -574,6 +573,36 @@ group { name: "e/init/extra_screen"; transition: DECELERATE 1.0; target: "shadow"; target: "blanker"; + after: "ready"; } + program { name: "ready"; + script { + new val; + val = get_int(do_end); + if (val == 1) + run_program(PROGRAM:"exit1"); + else + set_int(is_ready, 1); + } + } + program { signal: "e,state,done"; source: "e"; + script { + new val; + set_int(do_end, 1); + val = get_int(is_ready); + if (val == 1) + run_program(PROGRAM:"exit1"); + } + } + program { name: "exit1"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 1.0 CURRENT; + target: "shadow"; + target: "blanker"; + after: "exit2"; + } + program { name: "exit2"; + action: SIGNAL_EMIT "e,state,done_ok" "e"; + } } } -- 2.7.4