Add the reorder feature when the more panel is shown.

[framework/uifw/elementary.git] / src / lib / elm_segment_control.c

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 6f755b9..6ff6411 100644 (file)
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -331,7 +331,7 @@ _swallow_item_objects(Elm_Segment_Item *it)
 
    if (it->label)
      {
-        edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+        edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
         edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
      }
    else
@@ -437,20 +437,12 @@ _item_find(const Evas_Object *obj, int idx)
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-=======
->>>>>>> remotes/origin/upstream
    Widget_Data *wd;
    Elm_Segment_Item *item;
 
    if (part && strcmp(part, "default")) return;
 
-<<<<<<< HEAD
-   item = (Elm_Segment_Item *) it;
-=======
    item = (Elm_Segment_Item *)it;
->>>>>>> remotes/origin/upstream
    wd = elm_widget_item_data_get(item);
    if (!wd) return;
 
@@ -461,20 +453,14 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
      edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
    edje_object_message_signal_process(VIEW(item));
    //label can be NULL also.
-   edje_object_part_text_set(VIEW(item), "elm.text", item->label);
+   edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
 }
 
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   if (part && strcmp(part, "default")) return NULL;
-   return ((Elm_Segment_Item *) it)->label;
-=======
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Segment_Item *)it)->label;
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -482,27 +468,14 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-=======
->>>>>>> remotes/origin/upstream
    Elm_Segment_Item *item;
-
    if (part && strcmp(part, "icon")) return;
 
-<<<<<<< HEAD
-   item = (Elm_Segment_Item *) it;
-=======
    item = (Elm_Segment_Item *)it;
->>>>>>> remotes/origin/upstream
+   if (content == item->icon) return;
 
    //Remove the existing icon
-   if (item->icon)
-     {
-        edje_object_part_unswallow(VIEW(item), item->icon);
-        evas_object_del(item->icon);
-        item->icon = NULL;
-     }
+   if (item->icon) evas_object_del(item->icon);
    item->icon = content;
    if (item->icon)
      {
@@ -517,27 +490,15 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   if (part && strcmp(part, "icon")) return NULL;
-   return ((Elm_Segment_Item *) it)->icon;
-=======
    if (part && strcmp(part, "icon")) return NULL;
    return ((Elm_Segment_Item *)it)->icon;
->>>>>>> remotes/origin/upstream
 }
 
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-   Widget_Data *wd;
-   Elm_Segment_Item *item = (Elm_Segment_Item *) it;
-=======
    Widget_Data *wd;
    Elm_Segment_Item *item = (Elm_Segment_Item *)it;
->>>>>>> remotes/origin/upstream
 
    wd = elm_widget_item_data_get(item);
    if (!wd) return EINA_FALSE;
@@ -571,8 +532,6 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label)
                          *_elm_config->scale);
    evas_object_smart_member_add(VIEW(it), obj);
    elm_widget_sub_object_add(obj, VIEW(it));
-   evas_object_clip_set(VIEW(it), evas_object_clip_get(obj));
-
    _elm_theme_object_set(obj, VIEW(it), "segment_control", "item",
                          elm_object_style_get(obj));
    edje_object_mirrored_set(VIEW(it),
@@ -585,7 +544,7 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label)
    else
      edje_object_signal_emit(VIEW(it), "elm,state,text,hidden", "elm");
    edje_object_message_signal_process(VIEW(it));
-   edje_object_part_text_set(VIEW(it), "elm.text", label);
+   edje_object_part_text_escaped_set(VIEW(it), "elm.text", label);
 
    it->icon = icon;
    if (it->icon) elm_widget_sub_object_add(VIEW(it), it->icon);
@@ -655,11 +614,7 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon,
    wd->seg_items = eina_list_append(wd->seg_items, it);
    _update_list(wd);
 
-<<<<<<< HEAD
-   return (Elm_Object_Item *) it;
-=======
    return (Elm_Object_Item *)it;
->>>>>>> remotes/origin/upstream
 }
 
 EAPI Elm_Object_Item *
@@ -684,17 +639,7 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon,
      wd->seg_items = eina_list_append(wd->seg_items, it);
 
    _update_list(wd);
-<<<<<<< HEAD
-   return (Elm_Object_Item *) it;
-=======
    return (Elm_Object_Item *)it;
->>>>>>> remotes/origin/upstream
-}
-
-EAPI void
-elm_segment_control_item_del(Elm_Object_Item *it)
-{
-   elm_object_item_del(it);
 }
 
 EAPI void
@@ -709,11 +654,7 @@ elm_segment_control_item_del_at(Evas_Object *obj, int idx)
 
    it = _item_find(obj, idx);
    if (!it) return;
-<<<<<<< HEAD
-   elm_object_item_del((Elm_Object_Item *) it);
-=======
    elm_object_item_del((Elm_Object_Item *)it);
->>>>>>> remotes/origin/upstream
 }
 
 EAPI const char*
@@ -725,12 +666,6 @@ elm_segment_control_item_label_get(const Evas_Object *obj, int idx)
    return NULL;
 }
 
-EAPI void
-elm_segment_control_item_label_set(Elm_Object_Item* it, const char* label)
-{
-   _item_text_set_hook(it, NULL, label);
-}
-
 EAPI Evas_Object *
 elm_segment_control_item_icon_get(const Evas_Object *obj, int idx)
 {
@@ -740,12 +675,6 @@ elm_segment_control_item_icon_get(const Evas_Object *obj, int idx)
    return NULL;
 }
 
-EAPI void
-elm_segment_control_item_icon_set(Elm_Object_Item *it, Evas_Object *icon)
-{
-   _item_content_set_hook(it, NULL, icon);
-}
-
 EAPI int
 elm_segment_control_item_count_get(const Evas_Object *obj)
 {
@@ -779,11 +708,7 @@ elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    Widget_Data *wd;
-<<<<<<< HEAD
-   Elm_Segment_Item *item = (Elm_Segment_Item *) it;
-=======
    Elm_Segment_Item *item = (Elm_Segment_Item *)it;
->>>>>>> remotes/origin/upstream
 
    wd = elm_widget_item_data_get(item);
    if (!wd) return;
@@ -813,9 +738,5 @@ EAPI int
 elm_segment_control_item_index_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1);
-<<<<<<< HEAD
-   return ((Elm_Segment_Item *) it)->seg_index;
-=======
    return ((Elm_Segment_Item *)it)->seg_index;
->>>>>>> remotes/origin/upstream
 }