From c1d090812089807af5b9d8ca4b90345faa80ee63 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Fri, 9 Mar 2012 12:00:28 +0000 Subject: [PATCH] elm genlist: Fixed wrong member name. 'edit_item_style' -> 'decorate_all_item_style' Signed-off-by: Daniel Juyung Seo SVN revision: 69097 --- legacy/elementary/src/bin/test_genlist.c | 6 +++--- legacy/elementary/src/lib/elm_gen.h | 2 +- legacy/elementary/src/lib/elm_genlist.c | 10 +++++----- legacy/elementary/src/lib/elm_genlist.h | 11 ++++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index 30603d0aed..305db35dbc 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -1865,7 +1865,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(gl); itc10.item_style = "default"; - itc10.mode_item_style = "mode"; + itc10.decorate_item_style = "mode"; itc10.func.text_get = gl10_text_get; itc10.func.content_get = gl10_content_get; itc10.func.state_get = gl_state_get; @@ -2444,7 +2444,7 @@ test_genlist15(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i itc15->func.content_get = gl15_content_get; itc15->func.state_get = gl_state_get; itc15->func.del = gl15_del; - itc15->edit_item_style = "edit"; + itc15->decorate_all_item_style = "edit"; for (i = 0; i < 100; i++) { @@ -2574,7 +2574,7 @@ test_genlist16(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i itc15->func.content_get = gl16_content_get; itc15->func.state_get = gl_state_get; itc15->func.del = NULL; - itc15->edit_item_style = "edit"; + itc15->decorate_all_item_style = "edit"; for (i = 0; i < 100; i++) { diff --git a/legacy/elementary/src/lib/elm_gen.h b/legacy/elementary/src/lib/elm_gen.h index 176f3edced..431f7b1bb3 100644 --- a/legacy/elementary/src/lib/elm_gen.h +++ b/legacy/elementary/src/lib/elm_gen.h @@ -49,7 +49,7 @@ struct _Elm_Gen_Item_Class Eina_Bool delete_me : 1; /**< Leave this alone - set it to 0 if you have a const class of your own */ const char *item_style; /**< Name of the visual style to use for this item. If you don't know use "default" */ const char *decorate_item_style; /**< Style used if item is set to a decorate mode. @see elm_genlist_item_decorate_mode_set() or NULL if you don't care. currently it's used only in genlist. */ - const char *edit_item_style; /**< Style to use when in edit mode, or NULL if you don't care. currently it's used only in genlist. */ + const char *decorate_all_item_style; /**< Style to use when in edit mode, or NULL if you don't care. currently it's used only in genlist. */ struct { Elm_Gen_Item_Text_Get_Cb text_get; /**< Text fetching class function for genlist/gengrid item classes.*/ diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 9238442bd0..b031aa1afc 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2061,7 +2061,7 @@ _item_realize(Elm_Gen_Item *it, _multi_move, it); if ((it->wd->decorate_mode) && (!it->edit_obj) && - (it->item->type != ELM_GENLIST_ITEM_GROUP) && (it->itc->edit_item_style)) + (it->item->type != ELM_GENLIST_ITEM_GROUP) && (it->itc->decorate_all_item_style)) _decorate_mode_item_realize(it, EINA_FALSE); _elm_genlist_item_state_update(it, itc); @@ -2155,7 +2155,7 @@ _item_realize(Elm_Gen_Item *it, if ((!calc) && (it->wd->decorate_mode) && (it->item->type != ELM_GENLIST_ITEM_GROUP)) { - if (it->itc->edit_item_style) + if (it->itc->decorate_all_item_style) { if (!it->edit_obj) _decorate_mode_item_realize(it, EINA_FALSE); edje_object_message_signal_process(it->edit_obj); @@ -2445,7 +2445,7 @@ _item_block_position(Item_Block *itb, } if (!it->item->move_effect_enabled) { - if ((it->wd->decorate_mode) && (it->itc->edit_item_style)) + if ((it->wd->decorate_mode) && (it->itc->decorate_all_item_style)) _decorate_mode_item_position(it, it->item->scrl_x, it->item->scrl_y); else @@ -3303,7 +3303,7 @@ _decorate_mode_item_realize(Elm_Gen_Item *it, Eina_Bool effect_on) strncat(buf, "_compress", sizeof(buf) - strlen(buf)); strncat(buf, "/", sizeof(buf) - strlen(buf)); - strncat(buf, it->itc->edit_item_style, sizeof(buf) - strlen(buf)); + strncat(buf, it->itc->decorate_all_item_style, sizeof(buf) - strlen(buf)); _elm_theme_object_set(WIDGET(it), it->edit_obj, "genlist", buf, elm_widget_style_get(WIDGET(it))); @@ -5546,7 +5546,7 @@ elm_genlist_decorate_mode_set(Evas_Object *obj, Eina_Bool decorated) if (it->item->type != ELM_GENLIST_ITEM_GROUP) { if (it->selected) _item_unselect(it); - if (it->itc->edit_item_style) + if (it->itc->decorate_all_item_style) _decorate_mode_item_realize(it, EINA_TRUE); } } diff --git a/legacy/elementary/src/lib/elm_genlist.h b/legacy/elementary/src/lib/elm_genlist.h index f53ac74b3c..8d610a5202 100644 --- a/legacy/elementary/src/lib/elm_genlist.h +++ b/legacy/elementary/src/lib/elm_genlist.h @@ -32,11 +32,12 @@ * of the item style. It @b must be specified and the default should be @c * "default". * - @c decorate_item_style - This is a constant string and simply defines the name - * of the mode item style. It is used to specify mode item style. It can be - * used to set sweep mode. - * - @c edit_item_style - This is a constant string and simply defines the name - * of the edit item style. It is used to specify edit item style. It can be - * used to set selection, checking and deletion mode. + * of the decorate mode item style. It is used to specify decorate mode item style. It can be + * used when you call elm_genlist_item_decorate_mode_set(). + * - @c decorate_all_item_style - This is a constant string and simply defines the name + * of the decorate all item style. It is used to specify decorate all item style. It can be + * used to set selection, checking and deletion mode. This is used when you + * call elm_genlist_decorate_mode_set(). * - @c func - A struct with pointers to functions that will be called when * an item is going to be actually created. All of them receive a @c data * parameter that will point to the same data passed to