e_comp: remove the shadow_style

The shadow_style is not used anymore. It is deprecated.

Change-Id: I54d015f620806a24ac66d09883dc75456d328ca1

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index d26695d27fd4956d1a151a6aea7c8d1785661fec..04153667b2af1ca64272087d2c5397daeb44bcf1 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -870,7 +870,6 @@ static Eina_Bool
 _e_comp_object_shadow_setup(E_Comp_Object *cw)
 {
    int ok = 0;
-   char buf[4096];
    Eina_List *list = NULL, *l;
    E_Input_Rect_Data *input_rect_data;
    E_Input_Rect_Smart_Data *input_rect_sd;
@@ -900,28 +899,6 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
 
              focus = m->focus;
              no_shadow = m->no_shadow;
-             if (m->shadow_style)
-               {
-                  /* fast effects are just themes with "/fast" appended and shorter effect times */
-                  if (fast)
-                    {
-                       snprintf(buf, sizeof(buf), "e/comp/frame/%s/fast", m->shadow_style);
-                       reshadow = ok = !e_util_strcmp(reshadow_group, buf);
-                       if (!ok)
-                         ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", buf);
-                    }
-                  /* default to non-fast style if fast not available */
-                  if (!ok)
-                    {
-                       snprintf(buf, sizeof(buf), "e/comp/frame/%s", m->shadow_style);
-                       reshadow = ok = !e_util_strcmp(reshadow_group, buf);
-                       if (!ok)
-                         ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", buf);
-                    }
-                  if (ok && m->visibility_effect)
-                    eina_stringshare_refplace(&cw->visibility_effect, m->visibility_effect);
-                  if (ok) break;
-               }
           }
      }
    while (!ok)
@@ -933,23 +910,6 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
                ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", "e/comp/frame/none");
           }
         if (ok) break;
-        if (conf->shadow_style)
-          {
-             if (fast)
-               {
-                  snprintf(buf, sizeof(buf), "e/comp/frame/%s/fast", conf->shadow_style);
-                  reshadow = ok = !e_util_strcmp(reshadow_group, buf);
-                  if (!ok)
-                    ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", buf);
-               }
-             if (!ok)
-               {
-                  snprintf(buf, sizeof(buf), "e/comp/frame/%s", conf->shadow_style);
-                  reshadow = ok = !e_util_strcmp(reshadow_group, buf);
-                  if (!ok)
-                    ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", buf);
-               }
-          }
         if (!ok)
           {
              if (fast)
@@ -3122,9 +3082,7 @@ e_comp_object_util_add(Evas_Object *obj)
 {
    Evas_Object *o;
    const char *name;
-   E_Comp_Config *conf = e_comp_config_get();
    Eina_Bool skip = EINA_FALSE;
-   char buf[1024];
    int ok = 0;
    int x, y, w, h;
    Eina_Bool vis;
@@ -3140,11 +3098,6 @@ e_comp_object_util_add(Evas_Object *obj)
    if (skip)
      evas_object_data_set(o, "comp_object_skip", (void*)1);
 
-   if (conf->shadow_style)
-     {
-        snprintf(buf, sizeof(buf), "e/comp/frame/%s", conf->shadow_style);
-        ok = e_theme_edje_object_set(o, "base/theme/comp", buf);
-     }
    if (!ok)
      e_theme_edje_object_set(o, "base/theme/comp", "e/comp/frame/default");
    if (e_util_strcmp(evas_object_type_get(obj), "edje") || (!edje_object_data_get(obj, "noshadow")))

diff --git a/src/bin/core/e_comp_cfdata.c b/src/bin/core/e_comp_cfdata.c
index ed919ded75b0af4dc23403d9eeaa2470424f2f51..c395ad290b2d3585a478a9dba847e8959defd506 100644 (file)
--- a/src/bin/core/e_comp_cfdata.c
+++ b/src/bin/core/e_comp_cfdata.c
@@ -21,7 +21,6 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
    E_CONFIG_VAL(D, T, modal, CHAR);
    E_CONFIG_VAL(D, T, focus, CHAR);
    E_CONFIG_VAL(D, T, no_shadow, CHAR);
-   E_CONFIG_VAL(D, T, shadow_style, STR);
    E_CONFIG_VAL(D, T, visibility_effect, STR);
 
    *conf_edd = E_CONFIG_DD_NEW("Comp_Config", E_Comp_Config);
@@ -30,7 +29,6 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
 #define T E_Comp_Config
 #define D *conf_edd
    E_CONFIG_VAL(D, T, version, INT);
-   E_CONFIG_VAL(D, T, shadow_style, STR);
    E_CONFIG_VAL(D, T, engine, INT);
    E_CONFIG_VAL(D, T, effect_file, STR);
    E_CONFIG_VAL(D, T, effect_style, STR);
@@ -101,7 +99,6 @@ e_comp_cfdata_config_new(void)
    cfg = E_NEW(E_Comp_Config, 1);
    if (!cfg) goto error;
    cfg->version = E_COMP_VERSION;
-   cfg->shadow_style = eina_stringshare_add("default");
    cfg->effect_file = NULL;
    cfg->effect_style = "none";
    cfg->depth_in_style = "none";
@@ -142,19 +139,16 @@ e_comp_cfdata_config_new(void)
    if (!mat) goto error;
    cfg->match.popups = eina_list_append(cfg->match.popups, mat);
    mat->name = eina_stringshare_add("shelf");
-   mat->shadow_style = eina_stringshare_add("popup");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.popups = eina_list_append(cfg->match.popups, mat);
    mat->name = eina_stringshare_add("_e_popup_desklock");
-   mat->shadow_style = eina_stringshare_add("still");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.popups = eina_list_append(cfg->match.popups, mat);
    mat->name = eina_stringshare_add("_e_popup_notification");
-   mat->shadow_style = eina_stringshare_add("still");
    mat->no_shadow = 1;
    mat->focus = 1;
 
@@ -162,13 +156,11 @@ e_comp_cfdata_config_new(void)
    if (!mat) goto error;
    cfg->match.popups = eina_list_append(cfg->match.popups, mat);
    mat->name = eina_stringshare_add("E Drag");
-   mat->shadow_style = eina_stringshare_add("still");
    mat->no_shadow = 1;
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.popups = eina_list_append(cfg->match.popups, mat);
-   mat->shadow_style = eina_stringshare_add("popup");
 
    cfg->match.borders = NULL;
 
@@ -176,7 +168,6 @@ e_comp_cfdata_config_new(void)
    if (!mat) goto error;
    cfg->match.borders = eina_list_append(cfg->match.borders, mat);
    mat->fullscreen = 1;
-   mat->shadow_style = eina_stringshare_add("fullscreen");
 
    cfg->match.overrides = NULL;
 
@@ -185,60 +176,50 @@ e_comp_cfdata_config_new(void)
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->name = eina_stringshare_add("E");
    mat->clas = eina_stringshare_add("everything");
-   mat->shadow_style = eina_stringshare_add("everything");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_DROPDOWN_MENU;
-   mat->shadow_style = eina_stringshare_add("menu");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_POPUP_MENU;
-   mat->shadow_style = eina_stringshare_add("menu");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_COMBO;
-   mat->shadow_style = eina_stringshare_add("menu");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_TOOLTIP;
-   mat->shadow_style = eina_stringshare_add("menu");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_MENU;
-   mat->shadow_style = eina_stringshare_add("menu");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_DND;
-   mat->shadow_style = eina_stringshare_add("still");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
    mat->primary_type = E_WINDOW_TYPE_DOCK;
-   mat->shadow_style = eina_stringshare_add("none");
 
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
-   mat->shadow_style = eina_stringshare_add("popup");
 
    cfg->match.menus = NULL;
    mat = E_NEW(E_Comp_Match, 1);
    if (!mat) goto error;
    cfg->match.menus = eina_list_append(cfg->match.menus, mat);
-   mat->shadow_style = eina_stringshare_add("menu");
 
    cfg->dim_rect_effect = 0;
    cfg->dim_rect_enable = 0;
@@ -274,7 +255,6 @@ e_comp_cfdata_match_free(E_Comp_Match *m)
    eina_stringshare_del(m->name);
    eina_stringshare_del(m->clas);
    eina_stringshare_del(m->role);
-   eina_stringshare_del(m->shadow_style);
    eina_stringshare_del(m->visibility_effect);
    free(m);
 }
@@ -288,7 +268,6 @@ e_comp_cfdata_config_free(E_Comp_Config *cfg)
    eina_stringshare_del(cfg->bg_effect_style);
    eina_stringshare_del(cfg->kbd_effect_style);
    eina_stringshare_del(cfg->effect_file);
-   eina_stringshare_del(cfg->shadow_style);
    eina_stringshare_del(cfg->launch_file);
 
    E_FREE_LIST(cfg->match.popups, e_comp_cfdata_match_free);

diff --git a/src/bin/core/e_view_edje.c b/src/bin/core/e_view_edje.c
index a31f190284e2471af2949f808c9bfa25ca15e048..54676543e8c3852367133941810bd6b401d19519 100644 (file)
--- a/src/bin/core/e_view_edje.c
+++ b/src/bin/core/e_view_edje.c
@@ -563,9 +563,7 @@ e_view_edje_util_add(E_View *view)
    E_View_Edje *edje;
    E_View *edje_view;
    const char *name;
-   E_Comp_Config *conf = e_comp_config_get();
    Eina_Bool skip = EINA_FALSE;
-   char buf[1024];
    int ok = 0;
    int x, y, w, h;
    Eina_Bool vis;
@@ -584,11 +582,6 @@ e_view_edje_util_add(E_View *view)
    if (skip)
      e_view_data_set(edje_view, "comp_object_skip", (void*)1);
 
-   if (conf->shadow_style)
-     {
-        snprintf(buf, sizeof(buf), "e/comp/frame/%s", conf->shadow_style);
-        ok = e_theme_edje_view_set(edje, NULL, buf);
-     }
    if (!ok)
      e_theme_edje_view_set(edje, NULL, "e/comp/frame/default");
    if ((view->type == E_VIEW_TYPE_EDJE) || (!e_view_edje_data_get(edje, "noshadow")))

diff --git a/src/include/e_comp_cfdata.h b/src/include/e_comp_cfdata.h
index 3d61841bd1bbd93d1c8493dc9b5a95c63d4d45a6..288b4d7bee59a77de05b6b74daa8099dc974c822 100644 (file)
--- a/src/include/e_comp_cfdata.h
+++ b/src/include/e_comp_cfdata.h
@@ -10,7 +10,7 @@ typedef struct _E_Comp_Match  E_Comp_Match;
 struct _E_Comp_Config
 {
    int           version;
-   const char   *shadow_style;
+   E_DEPRECATED  char   *shadow_style;
    const char   *effect_file; // effect edj path for effect object
    const char   *effect_style; // name of effect group to apply
    const char   *depth_in_style; // name of effect group to apply for depth in type
@@ -90,7 +90,7 @@ struct _E_Comp_Match
    const char *clas; // glob - used for borders, overrides, NULL if not to be used
    const char *role; // glob - used for borders
 
-   const char *shadow_style; // shadow style to use
+   E_DEPRECATED const char *shadow_style; // shadow style to use
    const char *visibility_effect; // effect to use when showing and hiding
 
    int         primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used