Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_tlist.c
Log Message:
Always treat it as markup if it's markup initially.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_tlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_tlist.c 23 Jan 2006 18:33:20 -0000 1.1
+++ e_tlist.c 27 Jan 2006 05:09:22 -0000 1.2
@@ -31,6 +31,7 @@
void (*func_hilight) (void *data, void *data2);
void *data;
void *data2;
+ unsigned char markup : 1;
};
/* local subsystem functions */
@@ -115,7 +116,13 @@
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, sd->selected);
- if (si) return edje_object_part_text_get(si->base_obj, "label");
+ if (si)
+ {
+ if (si->markup)
+ return edje_object_part_text_get(si->base_obj, "labelblock");
+ else
+ return edje_object_part_text_get(si->base_obj, "label");
+ }
return NULL;
}
@@ -211,7 +218,10 @@
if (si)
{
char *t;
- t = strdup(edje_object_part_text_get(si->base_obj, "label"));
+ if (si->markup)
+ t = strdup(edje_object_part_text_get(si->base_obj,
"labelblock"));
+ else
+ t = strdup(edje_object_part_text_get(si->base_obj, "label"));
if (!strcmp(t, label))
{
evas_object_del(si->base_obj);
@@ -242,6 +252,7 @@
API_ENTRY return;
si = E_NEW(E_Smart_Item, 1);
si->sd = sd;
+ si->markup = markup;
si->base_obj = edje_object_add(evas_object_evas_get(sd->smart_obj));
/* FIXME: Use a color class or something to avoid duplicating the theme
with only the background piccie being different. */
@@ -251,7 +262,7 @@
else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/tlist");
- if (markup)
+ if (si->markup)
edje_object_part_text_set(si->base_obj, "labelblock", label);
else
edje_object_part_text_set(si->base_obj, "label", label);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
