background-zoom-fade: have rotation angle as 2nd param

Change-Id: I209654ef2e50029e88ee03131dab020cfb63736a

diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc
index 73f1cc3..4833783 100644 (file)
--- a/data/group/background-zoom-fade.edc
+++ b/data/group/background-zoom-fade.edc
@@ -6,7 +6,8 @@ group { name: "e/comp/effects/background-zoom-fade";
                   new st;
                   new bg;
                   st = getarg(2);
-                  bg = getarg(3);
+                  // new rot = getarg(3);
+                  bg = getarg(4);
                   if (st == 0)
                     {
                        set_state(PART:"e.swallow.content", "zoom-in", 0.0);

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 5e6fd99..2b1f8c1 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -545,6 +545,7 @@ static void
 _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
 {
    E_Effect_Client *bg_efc = NULL;
+   int ang = -1;
 
    if (!bg_ec) return;
    if (e_object_is_del(E_OBJECT(bg_ec))) return;
@@ -557,7 +558,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
      return;
 
    // 1st param : zoom-in(0) zoom-out(1)
-   // 2nd param : background rect transparency(0) opaque(1)
+   // 2nd param : rotation angle
+   // 3rd param : background rect transparency(0) opaque(1)
    switch (type)
      {
       case E_EFFECT_TYPE_SHOW:
@@ -566,7 +568,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
            {
               e_object_ref(E_OBJECT(bg_ec));
               _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0, bg_opaque}, 2);
+              ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
+              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0, ang, bg_opaque}, 3);
               e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_in_done, bg_ec);
               bg_efc->bg_animating = 1;
            }
@@ -575,7 +578,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
       case E_EFFECT_TYPE_RESTACK_HIDE:
          e_object_ref(E_OBJECT(bg_ec));
          _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-         e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, bg_opaque}, 2);
+         ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
+         e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3);
          e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec);
          bg_efc->bg_animating = 1;
          break;
@@ -585,7 +589,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
            {
               e_object_ref(E_OBJECT(bg_ec));
               _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, bg_opaque}, 2);
+              ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
+              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3);
               e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec);
               bg_efc->bg_animating = 1;
            }