NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm genlist: Fixed wrong member name. 'mode_item_style' -> 'decorate_item_style' 

Signed-off-by: Daniel Juyung Seo <juyung.seo@samsung.com>

SVN revision: 69096
This commit is contained in:
Daniel Juyung Seo 2012-03-09 12:00:11 +00:00 committed by Daniel Juyung Seo
parent a38ae3b4ca
commit 5e6a70c7d8
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/elm_gen.h
View File

@ -48,7 +48,7 @@ struct _Elm_Gen_Item_Class
unsigned int refcount; /**< Set it to 0 if you use your own const class, or its managed for you by class ref/unref calls */
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 *mode_item_style; /**< Style used if item is set to a specific mode. @see elm_genlist_item_mode_set() or NULL if you don't care. currently it's used only in genlist. */
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. */
struct
{

2
legacy/elementary/src/lib/elm_gen_common.h
View File

@ -125,7 +125,7 @@ struct _Widget_Data
Elm_List_Mode mode;
Ecore_Timer *multi_timer, *scr_hold_timer;
Ecore_Animator *reorder_move_animator;
const char *mode_type;
const char *decorate_type;
double start_time;
Evas_Coord prev_x, prev_y, prev_mx, prev_my;
Evas_Coord cur_x, cur_y, cur_mx, cur_my;

26
legacy/elementary/src/lib/elm_genlist.c
View File

@ -542,7 +542,7 @@ _del_hook(Evas_Object *obj)
if (wd->queue_idle_enterer) ecore_idle_enterer_del(wd->queue_idle_enterer);
if (wd->must_recalc_idler) ecore_idler_del(wd->must_recalc_idler);
if (wd->multi_timer) ecore_timer_del(wd->multi_timer);
if (wd->mode_type) eina_stringshare_del(wd->mode_type);
if (wd->decorate_type) eina_stringshare_del(wd->decorate_type);
if (wd->scr_hold_timer) ecore_timer_del(wd->scr_hold_timer);
free(wd);
}
@ -1532,7 +1532,7 @@ _mode_finished_signal_cb(void *data,
_mode_item_unrealize(it);
if (it->item->group_item)
evas_object_raise(it->item->VIEW(group_item));
snprintf(buf, sizeof(buf), "elm,state,%s,passive,finished", it->wd->mode_type);
snprintf(buf, sizeof(buf), "elm,state,%s,passive,finished", it->wd->decorate_type);
edje_object_signal_callback_del_full(obj, buf, "elm", _mode_finished_signal_cb, it);
evas_event_thaw(te);
evas_event_thaw_eval(te);
@ -3157,7 +3157,7 @@ _mode_item_realize(Elm_Gen_Item *it)
if (it->item->order_num_in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf));
strncat(buf, "/", sizeof(buf) - strlen(buf));
strncat(buf, it->itc->mode_item_style, sizeof(buf) - strlen(buf));
strncat(buf, it->itc->decorate_item_style, sizeof(buf) - strlen(buf));
_elm_theme_object_set(WIDGET(it), it->item->mode_view, "genlist", buf,
elm_widget_style_get(WIDGET(it)));
@ -3247,7 +3247,7 @@ _item_mode_set(Elm_Gen_Item *it)
evas_event_thaw(evas_object_evas_get(it->wd->obj));
evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
snprintf(buf, sizeof(buf), "elm,state,%s,active", wd->mode_type);
snprintf(buf, sizeof(buf), "elm,state,%s,active", wd->decorate_type);
edje_object_signal_emit(it->item->mode_view, buf, "elm");
}
@ -3262,8 +3262,8 @@ _item_mode_unset(Widget_Data *wd)
it = wd->mode_item;
it->item->nocache_once = EINA_TRUE;
snprintf(buf, sizeof(buf), "elm,state,%s,passive", wd->mode_type);
snprintf(buf2, sizeof(buf2), "elm,state,%s,passive,finished", wd->mode_type);
snprintf(buf, sizeof(buf), "elm,state,%s,passive", wd->decorate_type);
snprintf(buf2, sizeof(buf2), "elm,state,%s,passive,finished", wd->decorate_type);
edje_object_signal_emit(it->item->mode_view, buf, "elm");
edje_object_signal_callback_add(it->item->mode_view, buf2, "elm", _mode_finished_signal_cb, it);
@ -5444,7 +5444,7 @@ elm_genlist_realized_items_update(Evas_Object *obj)
EAPI void
elm_genlist_item_decorate_mode_set(Elm_Object_Item *it,
const char *mode_type,
const char *decorate_type,
Eina_Bool mode_set)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
@ -5455,16 +5455,16 @@ elm_genlist_item_decorate_mode_set(Elm_Object_Item *it,
Elm_Object_Item *it2;
if (!wd) return;
if (!mode_type) return;
if (!decorate_type) return;
if ((_it->generation < _it->wd->generation) ||
elm_widget_item_disabled_get(_it)) return;
if (wd->decorate_mode) return;
if ((wd->mode_item == _it) &&
(!strcmp(mode_type, wd->mode_type)) &&
(!strcmp(decorate_type, wd->decorate_type)) &&
(mode_set))
return;
if (!_it->itc->mode_item_style) return;
if (!_it->itc->decorate_item_style) return;
_it->mode_set = mode_set;
if (wd->multi)
@ -5480,12 +5480,12 @@ elm_genlist_item_decorate_mode_set(Elm_Object_Item *it,
elm_genlist_item_selected_set(it2, EINA_FALSE);
}
if (((wd->mode_type) && (strcmp(mode_type, wd->mode_type))) ||
if (((wd->decorate_type) && (strcmp(decorate_type, wd->decorate_type))) ||
(mode_set) ||
((_it == wd->mode_item) && (!mode_set)))
_item_mode_unset(wd);
eina_stringshare_replace(&wd->mode_type, mode_type);
eina_stringshare_replace(&wd->decorate_type, decorate_type);
if (mode_set) _item_mode_set(_it);
}
@ -5494,7 +5494,7 @@ elm_genlist_item_decorate_mode_get(const Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
return _it->wd->mode_type;
return _it->wd->decorate_type;
}
EAPI const Elm_Object_Item *

2
legacy/elementary/src/lib/elm_genlist.h
View File

@ -31,7 +31,7 @@
* - @c item_style - This is a constant string and simply defines the name
* of the item style. It @b must be specified and the default should be @c
* "default".
* - @c mode_item_style - This is a constant string and simply defines the name
* - @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