enlightenment
/
enlightenment
5
6
Fork 6
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

rename visibility effect struct member effect -> visibility_effect

Browse Source 
feeble attempt at making future added effects more intelligible
devs/stefan/wl-session-recovery
Mike Blumenkrantz 8 years ago
parent ef5bfbad26
commit ba39887b26
4 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/bin/e_comp_cfdata.c
  2. 2
      src/bin/e_comp_cfdata.h
  3. 14
      src/bin/e_comp_object.c
  4. 20
      src/bin/e_int_config_comp_match.c

4
src/bin/e_comp_cfdata.c
Unescape View File

@ -24,7 +24,7 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
E_CONFIG_VAL(D, T, urgent, CHAR);
E_CONFIG_VAL(D, T, no_shadow, CHAR);
E_CONFIG_VAL(D, T, shadow_style, STR);
E_CONFIG_VAL(D, T, effect, STR);
E_CONFIG_VAL(D, T, visibility_effect, STR);
*conf_edd = E_CONFIG_DD_NEW("Comp_Config", E_Comp_Config);
#undef T
@ -205,7 +205,7 @@ e_comp_cfdata_match_free(E_Comp_Match *m)
eina_stringshare_del(m->clas);
eina_stringshare_del(m->role);
eina_stringshare_del(m->shadow_style);
eina_stringshare_del(m->effect);
eina_stringshare_del(m->visibility_effect);
free(m);
}

2
src/bin/e_comp_cfdata.h
Unescape View File

@ -62,7 +62,7 @@ struct _E_Comp_Match
const char *role; // glob - used for borders
const char *shadow_style; // shadow style to use
const char *effect; // effect to use when showing and hiding
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
char borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless

14
src/bin/e_comp_object.c
Unescape View File

@ -75,7 +75,7 @@ typedef struct _E_Comp_Object
Eina_Stringshare *frame_theme;
Eina_Stringshare *frame_name;
Eina_Stringshare *effect; //effect when toggling visibility
Eina_Stringshare *visibility_effect; //effect when toggling visibility
Evas_Object *smart_obj; // smart object
Evas_Object *clip; // clipper over effect object
@ -504,8 +504,8 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
if (!ok)
ok = e_theme_edje_object_set(cw->shobj, "base/theme/comp", buf);
}
if (ok && m->effect)
eina_stringshare_refplace(&cw->effect, m->effect);
if (ok && m->visibility_effect)
eina_stringshare_refplace(&cw->visibility_effect, m->visibility_effect);
if (ok) break;
}
}
@ -1296,11 +1296,11 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
e_comp->animating++;
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
if (cw->effect)
if (cw->visibility_effect)
{
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
e_comp_object_effect_set(obj, cw->effect);
e_comp_object_effect_set(obj, cw->visibility_effect);
e_comp_object_effect_params_set(obj, 0, (int[]){0}, 1);
e_comp_object_effect_start(obj, _e_comp_object_done_defer, cw);
}
@ -2039,11 +2039,11 @@ _e_comp_smart_show(Evas_Object *obj)
e_comp->animating++;
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
if (cw->effect)
if (cw->visibility_effect)
{
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
e_comp_object_effect_set(obj, cw->effect);
e_comp_object_effect_set(obj, cw->visibility_effect);
e_comp_object_effect_params_set(obj, 0, (int[]){1}, 1);
e_comp_object_effect_start(obj, _e_comp_object_done_defer, cw);
}

20
src/bin/e_int_config_comp_match.c
Unescape View File

@ -41,7 +41,7 @@ _match_dup(E_Comp_Match *m, Match_Config *m2)
m2->primary_type = m2->match.primary_type;
m2->match.shadow_style = eina_stringshare_ref(m2->match.shadow_style);
m2->match.effect = eina_stringshare_ref(m2->match.effect);
m2->match.visibility_effect = eina_stringshare_ref(m2->match.visibility_effect);
}
static void
@ -52,7 +52,7 @@ _match_free(Match_Config *m)
eina_stringshare_del(m->match.clas);
eina_stringshare_del(m->match.role);
eina_stringshare_del(m->match.shadow_style);
eina_stringshare_del(m->match.effect);
eina_stringshare_del(m->match.visibility_effect);
free(m->title);
free(m->name);
free(m->clas);
@ -69,7 +69,7 @@ _match_dup2(Match_Config *m2, E_Comp_Match *m)
m->clas = eina_stringshare_add(m->clas);
m->role = eina_stringshare_add(m->role);
m->shadow_style = eina_stringshare_add(m->shadow_style);
m->effect = eina_stringshare_add(m->effect);
m->visibility_effect = eina_stringshare_add(m->visibility_effect);
}
static const char *
@ -152,11 +152,11 @@ _match_label_get(Match_Config *m)
eina_strbuf_append(buf, _("Style:"));
eina_strbuf_append(buf, m->match.shadow_style);
}
if (m->match.effect)
if (m->match.visibility_effect)
{
eina_strbuf_append(buf, _(" / "));
eina_strbuf_append(buf, _("Effect:"));
eina_strbuf_append(buf, m->match.effect);
eina_strbuf_append(buf, m->match.visibility_effect);
}
if (!eina_strbuf_length_get(buf))
@ -248,7 +248,7 @@ _edit_ok(void *d1, void *d2)
Evas_Object *il;
if (m->title || m->name || m->clas || m->role || (m->primary_type != m->match.primary_type) ||
(eina_list_nth(m->cfd->cfdata->comp_effects, m->effect_type) != m->match.effect))
(eina_list_nth(m->cfd->cfdata->comp_effects, m->effect_type) != m->match.visibility_effect))
{
m->cfd->cfdata->changed = 1;
e_config_dialog_changed_set(m->cfd, 1);
@ -283,9 +283,9 @@ _edit_ok(void *d1, void *d2)
m->match.fullscreen = m->fullscreen;
m->match.modal = m->modal;
m->match.primary_type = m->primary_type;
eina_stringshare_refplace(&m->match.effect, eina_list_nth(m->cfd->cfdata->comp_effects, m->effect_type));
if (eina_streq(m->match.effect, "none"))
eina_stringshare_replace(&m->match.effect, NULL);
eina_stringshare_refplace(&m->match.visibility_effect, eina_list_nth(m->cfd->cfdata->comp_effects, m->effect_type));
if (eina_streq(m->match.visibility_effect, "none"))
eina_stringshare_replace(&m->match.visibility_effect, NULL);
il = m->cfd->cfdata->edit_il;
{
const Eina_List *l;
@ -555,7 +555,7 @@ _create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdat
EINA_LIST_FOREACH(cfdata->comp_effects->next, l, s)
{
m->effect_type++;
if (s == m->match.effect)
if (s == m->match.visibility_effect)
break;
}
if (!s) m->effect_type = 0;

Write Preview
Loading…
Cancel
Save