From a003dba19853a8fd5ebb3760a75800942a3269c2 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Mon, 15 Nov 2010 15:51:02 +0900 Subject: [PATCH] [edje_externals/elm_genlist.c] Merge SVN Revision 53663, 53754, 54445. Changeset 54445 for trunk/TMP/st/elementary/src/edje_externals/elm_genlist.c Timestamp: 11/10/10 14:44:44 (4 days ago) Author: watchwolf Message: elm : add expand in the edje external genlist MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Changeset 53754 for trunk/TMP/st/elementary/src/edje_externals/elm_genlist.c Timestamp: 10/21/10 15:03:43 (3 weeks ago) Author: lucas Message: Add support for changing style from one elm widget in edje external. Create a param 'style' that can be used in edje external to change the style of one object. Patch by: Otavio Pontes Changeset 53663 for trunk/TMP/st/elementary/src/edje_externals/elm_genlist.c Timestamp: 10/20/10 05:40:36 (4 weeks ago) Author: glima Message: Ugly typos gone. --- src/edje_externals/elm_genlist.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/edje_externals/elm_genlist.c b/src/edje_externals/elm_genlist.c index a8b2405..7b227f9 100644 --- a/src/edje_externals/elm_genlist.c +++ b/src/edje_externals/elm_genlist.c @@ -4,6 +4,7 @@ typedef struct _Elm_Params_Genlist { + Elm_Params base; const char *horizontal_mode; Eina_Bool multi:1; Eina_Bool multi_exists:1; @@ -21,7 +22,7 @@ typedef struct _Elm_Params_Genlist Eina_Bool v_bounce_exists:1; } Elm_Params_Genlist; -static const char* list_horizontal_mode_choices[] = {"compress", "scroll", "limit", NULL}; +static const char* list_horizontal_mode_choices[] = {"compress", "scroll", "limit", "expand", NULL}; static Elm_List_Mode _list_horizontal_mode_setting_get(const char *horizontal_mode_str) @@ -298,9 +299,9 @@ external_genlist_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__ } static Evas_Object *external_genlist_content_get(void *data __UNUSED__, - const Evas_Object *obj, const char *content) + const Evas_Object *obj __UNUSED__, const char *content __UNUSED__) { - ERR("so content"); + ERR("No content."); return NULL; } @@ -316,6 +317,7 @@ external_genlist_params_free(void *params) } static Edje_External_Param_Info external_genlist_params[] = { + DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("horizontal mode", "scroll", list_horizontal_mode_choices), EDJE_EXTERNAL_PARAM_INFO_BOOL("multi select"), EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"), -- 2.7.4