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

fix elm_segment_control to not abuse user's data for items. 

SVN revision: 73118
This commit is contained in:
Gustavo Sverzut Barbieri 2012-07-02 01:39:10 +00:00
parent c4caf9d82f
commit e79f9fb665
3 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/ChangeLog
View File

@ -254,3 +254,4 @@
2012-07-01 Gustavo Sverzut Barbieri (k-s)
* Add and use elm_widget_item_widget_get()
* Fix elm_segment_control to not abuse user's data from item.

1
legacy/elementary/NEWS
View File

@ -23,6 +23,7 @@ Fixes:
* Genlist : Realize move items during tree effect only when the item is not in the queue.
* Add missing files in the tarball.
* Fileselector : honor the folder_only option when using EIO
* Segment Selector : do not abuse user object item data.
Improvements:

50
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -99,12 +99,7 @@ _elm_segment_control_smart_sizing_eval(Evas_Object *obj)
static void
_item_free(Elm_Segment_Item *it)
{
Elm_Segment_Control_Smart_Data *sd;
if (!it) return;
sd = elm_widget_item_data_get(it);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
if (sd->selected_item == it) sd->selected_item = NULL;
if (sd->items) sd->items = eina_list_remove(sd->items, it);
@ -335,12 +330,7 @@ _elm_segment_control_smart_focus_next(const Evas_Object *obj,
static void
_segment_off(Elm_Segment_Item *it)
{
Elm_Segment_Control_Smart_Data *sd;
if (!it) return;
sd = elm_widget_item_data_get(it);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
edje_object_signal_emit(VIEW(it), "elm,state,segment,normal", "elm");
@ -350,12 +340,7 @@ _segment_off(Elm_Segment_Item *it)
static void
_segment_on(Elm_Segment_Item *it)
{
Elm_Segment_Control_Smart_Data *sd;
if (!it) return;
sd = elm_widget_item_data_get(it);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
if (it == sd->selected_item) return;
@ -383,16 +368,12 @@ _on_mouse_up(void *data,
Evas_Object *obj __UNUSED__,
void *event_info)
{
Elm_Segment_Control_Smart_Data *sd;
Elm_Segment_Item *it;
Evas_Event_Mouse_Up *ev;
Evas_Coord x, y, w, h;
it = data;
if (!it) return;
sd = elm_widget_item_data_get(it);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
if (elm_widget_disabled_get(ELM_WIDGET_DATA(sd)->obj)) return;
@ -414,14 +395,10 @@ _on_mouse_down(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
Elm_Segment_Control_Smart_Data *sd;
Elm_Segment_Item *it;
it = data;
if (!it) return;
sd = elm_widget_item_data_get(it);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
if (elm_widget_disabled_get(ELM_WIDGET_DATA(sd)->obj)) return;
@ -447,15 +424,11 @@ _item_text_set_hook(Elm_Object_Item *it,
const char *part,
const char *label)
{
Elm_Segment_Control_Smart_Data *sd;
Elm_Segment_Item *item;
if (part && strcmp(part, "default")) return;
item = (Elm_Segment_Item *)it;
sd = elm_widget_item_data_get(item);
if (!sd) return;
eina_stringshare_replace(&item->label, label);
if (item->label)
edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
@ -512,11 +485,8 @@ _item_content_get_hook(const Elm_Object_Item *it,
static Eina_Bool
_item_del_pre_hook(Elm_Object_Item *it)
{
Elm_Segment_Control_Smart_Data *sd;
Elm_Segment_Item *item = (Elm_Segment_Item *)it;
sd = elm_widget_item_data_get(item);
if (!sd) return EINA_FALSE;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
_item_free(item);
_update_list(sd);
@ -531,12 +501,9 @@ _item_new(Evas_Object *obj,
{
Elm_Segment_Item *it;
ELM_SEGMENT_CONTROL_DATA_GET(obj, sd);
it = elm_widget_item_new(obj, Elm_Segment_Item);
if (!it) return NULL;
elm_widget_item_data_set(it, sd);
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
@ -759,13 +726,10 @@ EAPI void
elm_segment_control_item_selected_set(Elm_Object_Item *it,
Eina_Bool selected)
{
Elm_Segment_Control_Smart_Data *sd;
Elm_Segment_Item *item = (Elm_Segment_Item *)it;
ELM_SEGMENT_CONTROL_ITEM_CHECK_OR_RETURN(it);
sd = elm_widget_item_data_get(item);
if (!sd) return;
ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd);
if (item == sd->selected_item)
{