summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-17 18:12:33 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-17 18:14:51 +0900
commit08073155b1a4f518bb5b17448df24249081989e6 (patch)
treea46bd09e56de1b469d3aa31c570c43057f37bc02
parentb461830e643518e85b0bce2c96fa87df5f395e14 (diff)
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
-rw-r--r--data/elementary/themes/edc/init.edc49
1 files changed, 39 insertions, 10 deletions
diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc
index 630b714a51..630ff20c9b 100644
--- a/data/elementary/themes/edc/init.edc
+++ b/data/elementary/themes/edc/init.edc
@@ -385,14 +385,13 @@ group { name: "e/init/splash";
385 } 385 }
386 } 386 }
387 programs { 387 programs {
388 program { 388 program { signal: "load"; source: "";
389 signal: "load"; source: "";
390 script { 389 script {
391 set_int(is_ready, 0); 390 set_int(is_ready, 0);
392 set_int(do_end, 0); 391 set_int(do_end, 0);
393 } 392 }
394 } 393 }
395 394
396#define PROG(_NAME) \ 395#define PROG(_NAME) \
397 program { name: _NAME"0"; \ 396 program { name: _NAME"0"; \
398 signal: "show"; source: ""; \ 397 signal: "show"; source: ""; \
@@ -460,8 +459,7 @@ group { name: "e/init/splash";
460 PROG("l+3") 459 PROG("l+3")
461#undef PROG 460#undef PROG
462 461
463 program { 462 program { signal: "show"; source: "";
464 signal: "show"; source: "";
465 action: STATE_SET "visible" 0.0; 463 action: STATE_SET "visible" 0.0;
466 transition: DECELERATE 1.0; 464 transition: DECELERATE 1.0;
467 target: "shadow"; 465 target: "shadow";
@@ -491,19 +489,16 @@ group { name: "e/init/splash";
491 set_int(is_ready, 1); 489 set_int(is_ready, 1);
492 } 490 }
493 } 491 }
494 program { 492 program { signal: "e,state,done"; source: "e";
495 signal: "e,state,done"; source: "e";
496 script { 493 script {
497 new val; 494 new val;
495 set_int(do_end, 1);
498 val = get_int(is_ready); 496 val = get_int(is_ready);
499 if (val == 1) 497 if (val == 1)
500 run_program(PROGRAM:"exit1"); 498 run_program(PROGRAM:"exit1");
501 else
502 set_int(do_end, 1);
503 } 499 }
504 } 500 }
505 program { name: "exit1"; 501 program { name: "exit1";
506 signal: "e,state,done"; source: "e";
507 action: STATE_SET "default" 0.0; 502 action: STATE_SET "default" 0.0;
508 transition: SINUSOIDAL 1.0 CURRENT; 503 transition: SINUSOIDAL 1.0 CURRENT;
509 target: "shadow"; 504 target: "shadow";
@@ -520,6 +515,10 @@ group { name: "e/init/extra_screen";
520 images.image: "screen_circular_shadow.png" COMP; 515 images.image: "screen_circular_shadow.png" COMP;
521 images.image: "bg_radgrad.png" COMP; 516 images.image: "bg_radgrad.png" COMP;
522 images.image: "dot_pattern.png" COMP; 517 images.image: "dot_pattern.png" COMP;
518 script {
519 public is_ready;
520 public do_end;
521 }
523 parts { 522 parts {
524 part { name: "clip"; type: RECT; mouse_events: 0; 523 part { name: "clip"; type: RECT; mouse_events: 0;
525 description { state: "default" 0.0; 524 description { state: "default" 0.0;
@@ -574,6 +573,36 @@ group { name: "e/init/extra_screen";
574 transition: DECELERATE 1.0; 573 transition: DECELERATE 1.0;
575 target: "shadow"; 574 target: "shadow";
576 target: "blanker"; 575 target: "blanker";
576 after: "ready";
577 } 577 }
578 program { name: "ready";
579 script {
580 new val;
581 val = get_int(do_end);
582 if (val == 1)
583 run_program(PROGRAM:"exit1");
584 else
585 set_int(is_ready, 1);
586 }
587 }
588 program { signal: "e,state,done"; source: "e";
589 script {
590 new val;
591 set_int(do_end, 1);
592 val = get_int(is_ready);
593 if (val == 1)
594 run_program(PROGRAM:"exit1");
595 }
596 }
597 program { name: "exit1";
598 action: STATE_SET "default" 0.0;
599 transition: SINUSOIDAL 1.0 CURRENT;
600 target: "shadow";
601 target: "blanker";
602 after: "exit2";
603 }
604 program { name: "exit2";
605 action: SIGNAL_EMIT "e,state,done_ok" "e";
606 }
578 } 607 }
579} 608}