enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

clean up border settings widget creation 

SVN revision: 73830
This commit is contained in:
Mike Blumenkrantz 2012-07-13 22:01:33 +00:00
parent b9e5519d50
commit 60ff477ca3
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/conf_theme/e_int_config_borders.c
View File

@ -189,8 +189,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ol, *ob, *oj, *orect, *of; Evas_Object *o, *ol, *ob, *oj, *orect, *of;
Evas_Coord w, h; Evas_Coord w, h;
Eina_List *borders, *l; Eina_List *borders;
int n, sel = 0; int n = 1, sel = 0;
const char *str, *tmp; const char *str, *tmp;
if (cfdata->border) if (cfdata->border)
@ -211,24 +211,24 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_ilist_freeze(ol); e_widget_ilist_freeze(ol);
e_widget_ilist_append(ol, orect, "borderless", NULL, NULL, "borderless"); e_widget_ilist_append(ol, orect, "borderless", NULL, NULL, "borderless");
for (n = 1, l = borders; l; l = l->next, n++) EINA_LIST_FREE(borders, str)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
ob = e_livethumb_add(evas); ob = e_livethumb_add(evas);
e_livethumb_vsize_set(ob, 96, 96); e_livethumb_vsize_set(ob, 96, 96);
oj = edje_object_add(e_livethumb_evas_get(ob)); oj = edje_object_add(e_livethumb_evas_get(ob));
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", str);
(char *)l->data);
e_theme_edje_object_set(oj, "base/theme/borders", buf); e_theme_edje_object_set(oj, "base/theme/borders", buf);
e_livethumb_thumb_set(ob, oj); e_livethumb_thumb_set(ob, oj);
orect = evas_object_rectangle_add(e_livethumb_evas_get(ob)); orect = evas_object_rectangle_add(e_livethumb_evas_get(ob));
evas_object_color_set(orect, 0, 0, 0, 128); evas_object_color_set(orect, 0, 0, 0, 128);
evas_object_show(orect); evas_object_show(orect);
edje_object_part_swallow(oj, "e.swallow.client", orect); edje_object_part_swallow(oj, "e.swallow.client", orect);
e_widget_ilist_append(ol, ob, (char *)l->data, NULL, NULL, l->data); e_widget_ilist_append(ol, ob, (char *)str, NULL, NULL, str);
if ((void*)tmp == l->data) if (tmp == str) sel = n;
sel = n; n++;
eina_stringshare_del(str);
} }
e_widget_size_min_get(ol, &w, &h); e_widget_size_min_get(ol, &w, &h);
@ -250,9 +250,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_list_object_append(o, ob, 1, 0, 0.0); e_widget_list_object_append(o, ob, 1, 0, 0.0);
} }
EINA_LIST_FREE(borders, str)
eina_stringshare_del(str);
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 1);
return o; return o;
} }