[SegmentControl] Clean Up
[framework/uifw/elementary.git] / src / lib / elm_segment_control.c
index 56471fc..04e155a 100644 (file)
@@ -17,18 +17,19 @@ struct _Widget_Data
    Evas_Object *box;
    Evas_Object *base;
    Eina_List *seg_ctrl;
+   Elm_Segment_Item *ani_it;
+   Ecore_Animator *ani;
+   void *data;
    int width, height;
    int id;
    int item_width;
-
-   Elm_Segment_Item *ani_it;
-   Ecore_Animator *ani;
+   int cur_fontsize;
+   int max_height, w_pad, h_pad;
    unsigned int count;
    unsigned int insert_index;
    unsigned int del_index;
    unsigned int cur_seg_id;
    double scale_factor;
-//   Eina_Bool longpressed : 1;
    Eina_Bool selected : 1;
 };
 
@@ -37,10 +38,10 @@ struct _Elm_Segment_Item
    Evas_Object *obj;
    Evas_Object *base;
    Evas_Object *icon;
+   Evas_Object *label_wd;
    const char *label;
-   Eina_Bool delete_me : 1;
    int segment_id;
-//   Ecore_Timer *long_timer;
+   Eina_Bool delete_me : 1;
 };
 
 static void _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
@@ -84,7 +85,14 @@ _signal_segment_off(void *data)
     
     edje_object_signal_emit(item->base, "elm,action,unfocus", "elm");
     edje_object_signal_emit(item->base, "elm,state,segment,off", "elm");
-    edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
+    if(!item->label_wd)
+      {
+         edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
+      }
+    if(item->label_wd)
+      {
+         elm_label_text_color_set(item->label_wd, 0xff,0xff, 0xff, 0xff);
+      }
 
     return;
 }
@@ -94,30 +102,25 @@ _signal_segment_on(void *data)
 {
    Elm_Segment_Item *item = (Elm_Segment_Item *) data;
    Elm_Segment_Item *it;
-   Eina_List *l;\r
+   Eina_List *l;
    
    Widget_Data *wd = elm_widget_data_get(item->obj);
    if (!wd) return;
 
    wd->selected = EINA_TRUE;
 
- /*  if (item->long_timer)
-     {
-       ecore_timer_del(item->long_timer);
-       item->long_timer = NULL;
-     }*/
-   //wd->longpressed = EINA_TRUE;
    edje_object_signal_emit(item->base, "elm,state,segment,on", "elm");
-   edje_object_signal_emit(item->base, "elm,state,text,change", "elm");
+   edje_object_signal_emit(item->base, "elm,action,focus", "elm");
+   if(!item->label_wd)
+     edje_object_signal_emit(item->base, "elm,state,text,change", "elm");
 
-   if (item->segment_id == wd->cur_seg_id)
-       return;\r
+   if (item->segment_id == wd->cur_seg_id) return;
 
    EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
      {
         if (it->segment_id == wd->cur_seg_id)
          {
-           _signal_segment_off (it);
+             _signal_segment_off (it);
             break;
          }
      }
@@ -132,32 +135,21 @@ _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Elm_Segment_Item *item = (Elm_Segment_Item *) data;
    Widget_Data *wd = elm_widget_data_get(item->obj);
-   Evas_Event_Mouse_Up * ev = event_info;
-   Evas_Coord x, y, w, h;
-
    if (!wd) return;
+   Evas_Coord wrap_width = 0, wrap_height = 0, w = 0, h = 0;
 
-   evas_object_geometry_get(obj, &x, &y, &w, &h);
-   if(ev->output.x > x && ev->output.x < x+w && ev->output.y > y && ev->output.y < y+h && wd->selected == EINA_FALSE)
-     {
-       _signal_segment_on(item);
-     }
-   else
+   if (item->segment_id == wd->cur_seg_id)
      {
-         wd->selected = EINA_FALSE;
-         return;
+       wd->selected = EINA_TRUE;
+       return;
      }
+    _signal_segment_on(item);
+    if(item->label_wd)
+       elm_label_text_color_set(item->label_wd, 0x00,0x00, 0x00, 0xff);
+
+     wd->selected = EINA_FALSE;
+     return;
 
-  // if(wd->longpressed == EINA_FALSE)
-     {
-       edje_object_signal_emit(item->base, "elm,action,unfocus", "elm");
-       edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
-     }
-  /* if (item->long_timer)
-     {
-       ecore_timer_del(item->long_timer);
-       item->long_timer = NULL;
-     }*/
 }
 
 static void
@@ -167,21 +159,9 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    Widget_Data *wd = elm_widget_data_get(item->obj);
 
    if (!wd) return;
-   //wd->longpressed = EINA_FALSE;
-
-   if (item->segment_id == wd->cur_seg_id)
-     {
-        wd->selected = EINA_TRUE;
-        return;
-     }
-
+   
    edje_object_signal_emit(item->base, "elm,action,focus", "elm");
-   edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
 
-   _signal_segment_on(item);
-
-/*   if (item->long_timer) ecore_timer_del(item->long_timer);
-   item->long_timer = ecore_timer_add(0.3, _signal_segment_on, item);*/
 }
 
 static void
@@ -202,9 +182,17 @@ _item_free(Evas_Object *obj, Elm_Segment_Item *it)
      wd->seg_ctrl = eina_list_remove(wd->seg_ctrl, it);
 
    if(it->icon) evas_object_del(it->icon);
+   if(it->label_wd) 
+     {
+        evas_object_del(it->label_wd);
+       it->label_wd = NULL;
+       if (edje_object_part_swallow_get(it->base, "elm.swallow.label.content") == NULL) 
+          {
+             edje_object_part_unswallow(it->base, it->label_wd);
+         }
+     }
    if(it->base) evas_object_del(it->base);
    if(it->label) eina_stringshare_del(it->label);
-//   if (it->long_timer) ecore_timer_del(it->long_timer);
 
    if(it)
      free(it);
@@ -249,6 +237,7 @@ _segment_resizing(void *data)
    evas_object_geometry_get(wd->base, NULL, NULL, &w, &h);
    wd->item_width = wd->width = w;
    wd->height = h;
+
    _state_value_set((Evas_Object *)data);
 }
 
@@ -263,6 +252,52 @@ _object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
    ecore_job_add(_segment_resizing, (Evas_Object *)data);
 }
 
+static void
+_segment_item_resizing(void *data)
+{
+   Widget_Data *wd;
+   Elm_Segment_Item *it = (Elm_Segment_Item *)data; 
+   wd = elm_widget_data_get(it->obj);
+
+   if(!wd) return;
+   Evas_Coord w = 0, h = 0;
+   
+   _update_list(it->obj);
+   evas_object_geometry_get(it->base, NULL, NULL, &w, &h);
+
+   if(wd->max_height == 1) wd->max_height = h;
+
+   if(it->label_wd) 
+     {
+       elm_label_wrap_width_set(it->label_wd, w-wd->w_pad);
+       elm_label_wrap_height_set(it->label_wd, wd->max_height-wd->h_pad);
+        if (it->segment_id == wd->cur_seg_id)
+          {
+            elm_label_text_color_set(it->label_wd, 0x00,0x00, 0x00, 0xff);
+          }
+        else
+           elm_label_text_color_set(it->label_wd, 0xFF,0xFF, 0xFF, 0xff);
+       if (edje_object_part_swallow_get(it->base, "elm.swallow.label.content") == NULL)
+         {
+            edje_object_part_unswallow(it->base, it->label_wd);
+         }
+       edje_object_part_swallow(it->base, "elm.swallow.label.content", it->label_wd);
+       edje_object_signal_emit(it->base, "elm,state,label,visible", "elm");
+        if (it->segment_id == wd->cur_seg_id)
+          {
+            elm_label_text_color_set(it->label_wd, 0x00,0x00, 0x00, 0xff);
+          }
+        else
+           elm_label_text_color_set(it->label_wd, 0xFF,0xFF, 0xFF, 0xff);
+     }
+}
+
+static void 
+_object_item_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   ecore_job_add(_segment_item_resizing, (Evas_Object *)data);
+}
+
 static Elm_Segment_Item*
 _item_new(Evas_Object *obj, const char *label, Evas_Object *icon)
 {
@@ -277,24 +312,21 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon)
    if(obj) it->obj = obj;
    it->delete_me = EINA_FALSE;
    it->segment_id = wd->id;
+   it->label_wd = NULL;
 
    it->base = edje_object_add(evas_object_evas_get(obj));
-   _elm_theme_object_set(obj, it->base, "segment", "base", elm_object_style_get(it->base));
+   _elm_theme_object_set(obj, it->obj, "segment", "base/default", elm_object_style_get(it->obj));
 
    if (it->label) eina_stringshare_del(it->label);
    if (label)
      {
         it->label = eina_stringshare_add(label);
      }
-   else
-     {
-         it->label = NULL;
-     }
 
    if ((it->icon != icon) && (it->icon))
       elm_widget_sub_object_del(obj, it->icon);
    it->icon = icon;
-   if (icon)
+   if (it->icon)
      {
         elm_widget_sub_object_add(obj, icon);
        Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
@@ -308,8 +340,8 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon)
      }
 
    edje_object_size_min_restricted_calc(obj, &mw, &mh, 0, 0);
-   evas_object_size_hint_weight_set(obj, 1.0, 1.0);
-   evas_object_size_hint_align_set(obj, -1.0, -1.0);
+   evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    return it;
 }
@@ -329,16 +361,23 @@ _update_list(Evas_Object *obj)
    if(wd->count == 1)
      {
         it = _item_find(obj, 0);
-       _elm_theme_object_set(obj, it->base, "segment", "base", "single");\r
+       _elm_theme_object_set(obj, it->base, "segment", "base/single", elm_object_style_get(it->obj));\r
        edje_object_signal_emit(it->base, "elm,state,segment,on", "elm");
-       edje_object_signal_emit(it->base, "elm,state,text,visible", "elm");
-       edje_object_signal_emit(it->base, "elm,state,text,change", "elm");
-       edje_object_message_signal_process(it->base);
-
-       edje_object_part_text_set(it->base, "elm.text", it->label);
+       if(!it->label_wd)
+         {
+            edje_object_signal_emit(it->base, "elm,state,text,visible", "elm");
+            edje_object_signal_emit(it->base, "elm,state,text,change", "elm");
+         }
 
+       if(it->label)
+          edje_object_part_text_set(it->base, "elm.text", it->label);
+        if (it->icon && edje_object_part_swallow_get(it->base, "elm.swallow.content") == NULL)
+          {
        edje_object_part_swallow(it->base, "elm.swallow.content", it->icon);
        edje_object_signal_emit(it->base, "elm,state,icon,visible", "elm");
+          }
+       edje_object_message_signal_process(it->base);
+
        return;
      }
 
@@ -346,27 +385,40 @@ _update_list(Evas_Object *obj)
      {
         if(i==0)
           {
-             _elm_theme_object_set(obj, it->base, "segment", "base", "first");
+             _elm_theme_object_set(obj, it->base, "segment", "base/first", elm_object_style_get(it->obj));
          }
        else if(i==wd->count-1)
           {
-            _elm_theme_object_set(obj, it->base, "segment", "base", "last");
+            _elm_theme_object_set(obj, it->base, "segment", "base/last", elm_object_style_get(it->obj));
          }
        else
          {
-            _elm_theme_object_set(obj, it->base, "segment", "base", "default");
-         }
+            _elm_theme_object_set(obj, it->base, "segment", "base/default", elm_object_style_get(it->obj));
 
-       edje_object_signal_emit(it->base, "elm,state,text,visible", "elm");
-       edje_object_message_signal_process(it->base);
+         }
+         
+       if(!it->label_wd)
+         {
+            edje_object_signal_emit(it->base, "elm,state,text,visible", "elm");
+         }
 
-       edje_object_part_text_set(it->base, "elm.text", it->label);
+       if(it->label)
+          edje_object_part_text_set(it->base, "elm.text", it->label);
 
+        if (it->icon && edje_object_part_swallow_get(it->base, "elm.swallow.content") == NULL)
+          {
        edje_object_part_swallow(it->base, "elm.swallow.content", it->icon);
        edje_object_signal_emit(it->base, "elm,state,icon,visible", "elm");
+          }
+       edje_object_message_signal_process(it->base);
 
        i++;
      }
+   if(wd->data && wd->selected)
+     {
+        _signal_segment_on(wd->data);
+        wd->selected = EINA_FALSE;
+     }
 }
 
 
@@ -388,7 +440,7 @@ _refresh_segment_ids(Evas_Object *obj)
      {
         if (wd->cur_seg_id >= wd->del_index)
           --wd->cur_seg_id;
-          wd->del_index =0;
+        wd->del_index =0;
      }
 
    EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
@@ -404,6 +456,7 @@ _state_value_set(Evas_Object *obj)
    Elm_Segment_Item *it;
    Eina_List *l;
    Evas_Coord mw, mh, x, y;
+
    int w1=0, w2, i=0;
    unsigned int count ;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -417,12 +470,12 @@ _state_value_set(Evas_Object *obj)
         evas_object_geometry_get(wd->ani_it->base, &x, &y, &w1, NULL);
        if (wd->ani_it->delete_me)
          {
-            w1-=(wd->item_width/15);
+            w1-=(wd->item_width/5);
             if( w1< 0) w1 = 0;
          }
        else
        {
-           w1+=(wd->item_width/15);
+           w1+=(wd->item_width/5);
           if( w1 > wd->item_width )
               w1 = wd->item_width;
        }
@@ -430,25 +483,26 @@ _state_value_set(Evas_Object *obj)
      }
    else
       w2 = wd->item_width;
-
+         
    EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
     {
        edje_object_size_min_restricted_calc(it->base, &mw, &mh, 0, 0);
        evas_object_size_hint_weight_set(it->base, 1.0, 1.0);
        evas_object_size_hint_align_set(it->base, -1.0, -1.0);
-
+       
+               
        if(wd->ani_it  && it == wd->ani_it)
          {
-           evas_object_resize(it->base, w1, wd->height);
+            evas_object_resize(it->base, w1, wd->height);
            evas_object_size_hint_min_set(it->base, w1, wd->height);
            evas_object_size_hint_max_set(it->base, w1, wd->height);
         }
        else
          {
-           evas_object_resize(it->base, w2, wd->height);
+           evas_object_resize(it->base, w2, wd->height);
            evas_object_size_hint_min_set(it->base, w2, wd->height);
            evas_object_size_hint_max_set(it->base, w2, wd->height);
-        }
+       }
        ++i;
     }
 
@@ -468,14 +522,14 @@ _animator_animate_add_cb(Evas_Object *obj)
      {
          _state_value_set(obj);
         evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-        return ECORE_CALLBACK_RENEW;
+        return (int*) ECORE_CALLBACK_RENEW;
      }
    else
      {
         ecore_animator_del(wd->ani);
        wd->ani = NULL;
        wd->ani_it = NULL;
-       return ECORE_CALLBACK_CANCEL;
+       return (int*) ECORE_CALLBACK_CANCEL;
      }
 }
 
@@ -492,7 +546,7 @@ _animator_animate_del_cb(Evas_Object *obj)
      {
         _state_value_set(obj);
        evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-       return ECORE_CALLBACK_RENEW;
+       return (int*) ECORE_CALLBACK_RENEW;
      }
    else
      {
@@ -503,7 +557,7 @@ _animator_animate_del_cb(Evas_Object *obj)
        wd->ani_it = NULL;
        _update_list(obj);
        wd->id = eina_list_count(wd->seg_ctrl);
-       return ECORE_CALLBACK_CANCEL;
+       return (int*) ECORE_CALLBACK_CANCEL;
      }
 }
 
@@ -518,9 +572,7 @@ _item_find(Evas_Object *obj, unsigned int index)
 
    EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
      {
-        if (i == index) {
-           return it;
-       }
+        if (i == index) return it;
        i++;
      }
      return NULL;
@@ -560,8 +612,11 @@ elm_segment_control_add(Evas_Object *parent)
    Evas *e;
    Widget_Data *wd;
 
+   const char *deffont, *maxheight, *wpad, *hpad;
+
    wd = ELM_NEW(Widget_Data);
    e = evas_object_evas_get(parent);
+   if(!e) return NULL;
    obj = elm_widget_add(e);
    elm_widget_type_set(obj, "segmented-control");
    elm_widget_sub_object_add(parent, obj);
@@ -586,20 +641,25 @@ elm_segment_control_add(Evas_Object *parent)
    wd->cur_seg_id = -1;
    wd->selected = EINA_FALSE;
 
+   deffont = edje_object_data_get(wd->base, "default_font_size");
+   if (deffont) wd->cur_fontsize = atoi(deffont);
+   else wd->cur_fontsize = 1;
+
+   maxheight = edje_object_data_get(wd->base, "max_height");
+   if (maxheight) wd->max_height = atoi(maxheight);
+   else wd->max_height = 1;
+
+   wpad = edje_object_data_get(wd->base, "w_pad");
+   if (wpad) wd->w_pad = atoi(wpad);
+   else wd->w_pad = 1;
+
+   hpad = edje_object_data_get(wd->base, "h_pad");
+   if (hpad) wd->h_pad = atoi(hpad);
+   else wd->h_pad = 1;
+
    return obj;
 }
 
-/**
- * Add a new segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param icon The icon object for added segment item
- * @param label The label for added segment item 
- * @param animate If 1 the action be animated with sliding effects default 0.
- * @return The new segment item or NULL if it cannot be created
- *
- * @ingroup SegmentControl SegmentControl
- */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate)
 {
@@ -612,9 +672,10 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *la
 
    wd->seg_ctrl = eina_list_append(wd->seg_ctrl, it);
    wd->id = eina_list_count(wd->seg_ctrl);
-   _update_list(obj);
+   //_update_list(obj);
    evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
    evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
+   evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _object_item_resize, it);
    wd->insert_index = 0;
    wd->del_index = 0;
    _refresh_segment_ids(obj);
@@ -639,40 +700,27 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *la
  * Add a new segment item to segmentcontrol
  * @param obj The SegmentControl object
  * @param icon The icon object for added segment item
- * @param label The label for added segment item 
+ * @param label The label for added segment item
  * @param animate If 1 the action be animated with sliding effects default 0.
  * @return The new segment item or NULL if it cannot be created
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate)
 {
-   EAPI Elm_Segment_Item * it;
+   Elm_Segment_Item * it;
    it = elm_segment_control_item_add(obj, icon, label, animate);
 \r
     return it;\r
 }
 
-/**
- * Insert a new segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param icon The icon object for added segment item
- * @param label The label for added segment item
- * @param index The position at which segment item to be inserted
- * @param animate If 1 the action be animated with sliding effects default 0.
- * @return The new segment item or NULL if it cannot be created
- *
- * @ingroup SegmentControl SegmentControl
- */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate)
 {
    Elm_Segment_Item *it, *it_rel;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return;
+   if(!wd) return NULL;
 
    it = _item_new(obj, label, icon);
    it_rel = _item_find(obj, index);
@@ -682,16 +730,17 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const ch
      }
    else
      {
-        if (!it) return;
+        if (!it) return NULL;
        wd->seg_ctrl = eina_list_prepend_relative(wd->seg_ctrl, it, it_rel);
      }
    evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
    evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
+   evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _object_item_resize, it);
    wd->insert_index = index;
    wd->id = eina_list_count(wd->seg_ctrl);
    _refresh_segment_ids(obj);
 
-   _update_list(obj);
+   //_update_list(obj);
    if(animate && it->segment_id && wd->ani_it == NULL)
      {
         wd->ani_it = it;
@@ -716,7 +765,6 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const ch
 
    return it ;
 }
-
 /**
  * Insert a new segment item to segmentcontrol
  * @param obj The SegmentControl object
@@ -724,10 +772,10 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const ch
  * @param label The label for added segment item
  * @param index The position at which segment item to be inserted
  * @param animate If 1 the action be animated with sliding effects default 0.
+ * @return The new segment item or NULL if it cannot be created
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI void
 elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate)
 {
@@ -737,14 +785,6 @@ elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const
    return;
 }
 
-/**
- * Delete a segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param item The Segment item to be deleted
- * @param animate If 1 the action be animated with sliding effects default 0.
- *
- * @ingroup SegmentControl SegmentControl
- */
 EAPI void
 elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate)
 {
@@ -752,9 +792,9 @@ elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool
    Widget_Data *wd = elm_widget_data_get(obj);
    if(!wd) return;
 
-   if(!item) return;
 
-   it = _item_search(obj, item);
+//   it = _item_search(obj, item);
+   it = item;
    if(!it) return;
 
    wd->del_index = it->segment_id;
@@ -768,10 +808,11 @@ elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool
      {
         evas_object_box_remove(wd->box, it->base);
        evas_object_smart_calculate(wd->box);
+
        _item_free(obj, it);
        _refresh_segment_ids(obj);
        _state_value_set(obj);
-       _update_list(obj);
+       //_update_list(obj);
      }
    wd->id = eina_list_count(wd->seg_ctrl);
    return;
@@ -780,12 +821,11 @@ elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool
 /**
  * Delete a segment item to segmentcontrol
  * @param obj The SegmentControl object
- * @param item The Segment item to be deleted
+ * @param index The position at which segment item to be deleted
  * @param animate If 1 the action be animated with sliding effects default 0.
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI void
 elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate)
 {
@@ -794,15 +834,6 @@ elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Ein
    return;
 }
 
-/**
- * Delete a segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param index The position at which segment item to be deleted
- * @param animate If 1 the action be animated with sliding effects default 0.
- *
- * @ingroup SegmentControl SegmentControl
- */
-
 EAPI void
 elm_segment_control_item_del_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate)
 {
@@ -831,21 +862,20 @@ elm_segment_control_item_del_at(Evas_Object *obj,  unsigned int index, Eina_Bool
        _item_free(obj, it);
        _refresh_segment_ids(obj);
        _state_value_set(obj);
-       _update_list(obj);
+       //_update_list(obj);
      }
    wd->id = eina_list_count(wd->seg_ctrl);
    return;
 }
 
 /**
- * Delete a segment item to segmentcontrol
+ * Delete a segment item of given index to segmentcontrol
  * @param obj The SegmentControl object
  * @param index The position at which segment item to be deleted
  * @param animate If 1 the action be animated with sliding effects default 0.
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI void
 elm_segment_control_delete_segment_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate)
 {
@@ -854,14 +884,6 @@ elm_segment_control_delete_segment_at(Evas_Object *obj,  unsigned int index, Ein
    return;
 }
 
-/**
- * Get the label of a segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @param index The index of the segment item
- * @return The label of the segment item
- *
- * @ingroup SegmentControl SegmentControl
- */
 
 EAPI const char *
 elm_segment_control_item_label_get(Evas_Object *obj, unsigned int index)
@@ -885,7 +907,6 @@ elm_segment_control_item_label_get(Evas_Object *obj, unsigned int index)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI const char *
 elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)
 {
@@ -895,15 +916,6 @@ elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)
    return label;
 }
 
-/**
- * Get the icon of a segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @param index The index of the segment item
- * @return The icon object or NULL if it is not found.
- *
- * @ingroup SegmentControl SegmentControl
- */
-
 EAPI Evas_Object *
 elm_segment_control_item_icon_get(Evas_Object *obj, unsigned int index)
 {
@@ -926,7 +938,6 @@ elm_segment_control_item_icon_get(Evas_Object *obj, unsigned int index)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI Evas_Object *
 elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)
 {
@@ -936,14 +947,6 @@ elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)
    return icon;
 }
 
-/**
- * Get the currently selected segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @return The selected Segment item
- *
- * @ingroup SegmentControl SegmentControl
- */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_item_selected_get(const Evas_Object *obj)
 {
@@ -963,12 +966,10 @@ elm_segment_control_item_selected_get(const Evas_Object *obj)
 /**
  * Get the currently selected segment item of segmentcontrol
  * @param obj The SegmentControl object
- * @param value The current segment item id
  * @return The selected Segment item
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)
 {
@@ -979,13 +980,6 @@ elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)
     return it;
  }
 
-/**
- * Get the count of segments of segmentcontrol
- * @param obj The SegmentControl object
- * @return The count of Segment items
- *
- * @ingroup SegmentControl SegmentControl
- */
 
 EAPI int
 elm_segment_control_item_count_get(Evas_Object *obj)
@@ -1003,7 +997,6 @@ elm_segment_control_item_count_get(Evas_Object *obj)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI int
 elm_segment_control_get_segment_count(Evas_Object *obj)
 {
@@ -1020,7 +1013,6 @@ elm_segment_control_get_segment_count(Evas_Object *obj)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI Evas_Object *
 elm_segment_control_item_object_get(Elm_Segment_Item *it)
 {
@@ -1036,22 +1028,23 @@ elm_segment_control_item_object_get(Elm_Segment_Item *it)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI void
 elm_segment_control_item_selected_set( Elm_Segment_Item *item, Eina_Bool select)
 {
+   if(!item) return;
    Widget_Data *wd = elm_widget_data_get(item->obj);
-   if(!wd) return NULL;
+   if(!wd) return;
 
    if(select)
      {
-      if(item->segment_id == wd->cur_seg_id)
-          return;
-                  
-      edje_object_signal_emit(item->base, "elm,action,focus", "elm");
-      edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
-
-      _signal_segment_on(item);
+      if(item->segment_id == wd->cur_seg_id) return;
+      wd->selected = EINA_TRUE;
+      if(wd->data)
+        {      
+           evas_object_del((Evas_Object *)wd->data);
+           wd->data = NULL;
+       }
+      wd->data = item;
 
       }
    else if(item->segment_id == wd->cur_seg_id)
@@ -1073,7 +1066,6 @@ elm_segment_control_item_selected_set( Elm_Segment_Item *item, Eina_Bool select)
  *
  * @ingroup SegmentControl SegmentControl
  */
-
 EAPI Elm_Segment_Item *
 elm_segment_control_item_get_at(Evas_Object *obj, unsigned int index)
 {
@@ -1082,4 +1074,47 @@ elm_segment_control_item_get_at(Evas_Object *obj, unsigned int index)
 
    return it;
 }
+\r
+/**
+ * Get the index of a Segment item of Segmentcontrol
+ * @param item The Segment item.
+ * @return The corresponding index of the Segment item.
+ *
+ * @ingroup SegmentControl SegmentControl
+ */
+EAPI int
+elm_segment_control_item_index_get(Elm_Segment_Item *item)
+{
+   if(!item) return -1;
+   Widget_Data *wd = elm_widget_data_get(item->obj);
+   if(!wd) return -1;
+
+   return item->segment_id;
+}
+
+/**
+ * Set The Label widget to a Segment item of Segmentcontrol
+ * @param item The Segment item.
+ * @param label The Label.
+ * @return Evas_Object The Label widget.
+ *
+ * @ingroup SegmentControl SegmentControl
+ */
+EAPI Evas_Object *
+elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label)
+{
+   if(!item) return NULL;
+   Widget_Data *wd = elm_widget_data_get(item->obj);
+   if(!wd) return NULL;
+   if(!label) return NULL;
+
+   item->label_wd = elm_label_add(item->obj);  
+   elm_label_label_set(item->label_wd, label);
+   elm_label_text_align_set(item->label_wd, "middle");
+   elm_label_ellipsis_set(item->label_wd, 1);
+   elm_label_line_wrap_set(item->label_wd, 1);
+   eina_stringshare_replace(&item->label, label);
+
+   return item->label_wd;
+}