}
}
-group { name: "e/comp/default";
+group { name: "e/comp/border/default";
images.image: "win_shadow.png" COMP;
images.image: "win_glow.png" COMP;
parts {
}
}
-group { name: "e/comp/rotate";
- inherit: "e/comp/default";
+group { name: "e/comp/border/rotate";
+ inherit: "e/comp/border/default";
parts {
part { name: "e.swallow.content";
description { state: "default";
}
}
-group { name: "e/comp/rotate/fast";
- inherit: "e/comp/rotate";
+group { name: "e/comp/border/rotate/fast";
+ inherit: "e/comp/border/rotate";
programs {
program { name: "focus3";
transition: LINEAR 0;
}
}
-group { name: "e/comp/flip";
- inherit: "e/comp/rotate";
+group { name: "e/comp/border/flip";
+ inherit: "e/comp/border/rotate";
parts {
part { name: "e.swallow.content";
description { state: "default";
}
}
-group { name: "e/comp/flip/fast";
- inherit: "e/comp/flip";
+group { name: "e/comp/border/flip/fast";
+ inherit: "e/comp/border/flip";
programs {
program { name: "focus3";
transition: LINEAR 0;
}
}
-group { name: "e/comp/popup";
- inherit: "e/comp/default";
+group { name: "e/comp/border/popup";
+ inherit: "e/comp/border/default";
parts {
part { name: "focus-clipper";
description { state: "default";
}
}
-group { name: "e/comp/default/fast";
- inherit: "e/comp/default";
+group { name: "e/comp/border/default/fast";
+ inherit: "e/comp/border/default";
programs {
program {
name: "visible_on";
}
}
-group { name: "e/comp/popup/fast";
- inherit: "e/comp/default/fast";
+group { name: "e/comp/border/popup/fast";
+ inherit: "e/comp/border/default/fast";
parts {
part { name: "focus-clipper";
description { state: "default";
}
}
-group { name: "e/comp/none";
+group { name: "e/comp/border/none";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
}
}
-group { name: "e/comp/still";
- inherit: "e/comp/default";
+group { name: "e/comp/border/still";
+ inherit: "e/comp/border/default";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/still/fast";
- inherit: "e/comp/default/fast";
+group { name: "e/comp/border/still/fast";
+ inherit: "e/comp/border/default/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/menu";
- inherit: "e/comp/popup";
+group { name: "e/comp/border/menu";
+ inherit: "e/comp/border/popup";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/menu/fast";
- inherit: "e/comp/popup/fast";
+group { name: "e/comp/border/menu/fast";
+ inherit: "e/comp/border/popup/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/everything";
- inherit: "e/comp/popup";
+group { name: "e/comp/border/everything";
+ inherit: "e/comp/border/popup";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/everything/fast";
- inherit: "e/comp/popup/fast";
+group { name: "e/comp/border/everything/fast";
+ inherit: "e/comp/border/popup/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
}
}
-group { name: "e/comp/fullscreen";
+group { name: "e/comp/border/fullscreen";
images.image: "win_shadow.png" COMP;
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
}
}
-group { name: "e/comp/fullscreen/fast";
- inherit: "e/comp/fullscreen";
+group { name: "e/comp/border/fullscreen/fast";
+ inherit: "e/comp/border/fullscreen";
programs {
program {
name: "visible_on";
{
if (fast)
{
- snprintf(buf, sizeof(buf), "e/comp/%s/fast", m->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%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/borders", buf);
}
if (!ok)
{
- snprintf(buf, sizeof(buf), "e/comp/%s", m->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", m->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", buf);
{
if (skip || (cw->bd && cw->bd->client.e.state.video))
{
- reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/none");
+ reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/border/none");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/none");
+ ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/border/none");
}
if (ok) break;
if (conf->shadow_style)
{
if (fast)
{
- snprintf(buf, sizeof(buf), "e/comp/%s/fast", conf->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%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/borders", buf);
}
if (!ok)
{
- snprintf(buf, sizeof(buf), "e/comp/%s", conf->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", conf->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", buf);
{
if (fast)
{
- reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/default/fast");
+ reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/border/default/fast");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/default/fast");
+ ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/border/default/fast");
}
if (!ok)
{
- reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/default");
+ reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/border/default");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/default");
+ ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders", "e/comp/border/default");
}
}
break;
evas_object_show(oly);
oo = edje_object_add(e_livethumb_evas_get(ob));
- snprintf(buf, sizeof(buf), "e/comp/%s", oi->name);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", oi->name);
e_theme_edje_object_set(oo, "base/theme/borders", buf);
e_layout_pack(oly, oo);
e_layout_child_move(oo, 39, 39);
Eina_Stringshare *style;
E_Configure_Option_Info *oi;
- styles = e_theme_comp_list();
+ styles = e_theme_comp_border_list();
EINA_LIST_FREE(styles, style)
{
oi = e_configure_option_info_new(co, style, style);
}
EAPI int
-e_theme_comp_find(const char *comp)
+e_theme_comp_border_find(const char *comp)
{
Eina_List *comps = NULL;
int found = 0;
const char *str;
- comps = _e_theme_collection_items_find("base/theme/borders", "e/comp");
+ comps = _e_theme_collection_items_find("base/theme/borders", "e/comp/border");
if (eina_list_search_sorted(comps, EINA_COMPARE_CB(strcmp), comp))
found = 1;
}
EAPI Eina_List *
-e_theme_comp_list(void)
+e_theme_comp_border_list(void)
{
- return _e_theme_collection_items_find("base/theme/borders", "e/comp");
+ return _e_theme_collection_items_find("base/theme/borders", "e/comp/border");
}
/* local subsystem functions */
EAPI Eina_List *e_theme_border_list(void);
EAPI int e_theme_shelf_find(const char *shelf);
EAPI Eina_List *e_theme_shelf_list(void);
-EAPI int e_theme_comp_find(const char *shelf);
-EAPI Eina_List *e_theme_comp_list(void);
+EAPI int e_theme_comp_border_find(const char *theme);
+EAPI Eina_List *e_theme_comp_border_list(void);
#endif
#endif
evas_object_event_callback_add(oi, EVAS_CALLBACK_DEL,
_style_selector_del, oi);
sel = 0;
- styles = e_theme_comp_list();
+ styles = e_theme_comp_border_list();
n = 0;
EINA_LIST_FOREACH(styles, l, style)
{
oo = edje_object_add(e_livethumb_evas_get(ob));
ds_it->preview = oo;
- snprintf(buf, sizeof(buf), "e/comp/%s", style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", style);
e_theme_edje_object_set(oo, "base/theme/borders", buf);
e_layout_pack(oly, oo);
e_layout_child_move(oo, 39, 39);
evas_object_show(bg);
cm = edje_object_add(e_widget_preview_evas_get(ob));
- e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default");
+ e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/border/default");
evas_object_move(cm, 16, 16);
evas_object_resize(cm, 180 * sc, 70);
evas_object_show(cm);
objs = eina_list_append(objs, o);
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/popup");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/popup");
evas_object_move(o, (w - (400 * e_scale)) / 2, h - (40 * e_scale));
evas_object_resize(o, 400 * e_scale, (40 * e_scale));
evas_object_show(o);
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/default");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/default");
evas_object_move(o, w / 2, h / 9);
evas_object_resize(o, w / 3, h / 3);
evas_object_show(o);
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/default");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/default");
evas_object_move(o, w / 10, h / 5);
evas_object_resize(o, w / 2, h / 3);
evas_object_show(o);
evas_object_show(bg);
cm = edje_object_add(e_widget_preview_evas_get(ob));
- e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default");
+ e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/border/default");
evas_object_move(cm, 16, 16);
evas_object_resize(cm, 180 * sc, 80);
evas_object_show(cm);