[controlbar] remove default select

diff --git a/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c
index 86f3a9c..8ecc6c4 100644 (file)
--- a/src/lib/elm_controlbar.c
+++ b/src/lib/elm_controlbar.c
@@ -111,7 +111,7 @@ struct _Elm_Controlbar_Item
    int style;
    int badge;
    Eina_Bool selected;
-   Eina_Bool default_selected;
+//   Eina_Bool default_selected;
    //   Eina_Bool editable;
    Eina_Bool disable;
 };
@@ -1152,13 +1152,7 @@ selected_box(Elm_Controlbar_Item * it)
         }
         it->selected = EINA_TRUE;
 
-        if((fit != NULL && fit != it) || it->default_selected)
-          {
-             it->default_selected = EINA_FALSE;
-             if(wd->more_item != it)
-                evas_object_smart_callback_call(it->obj, "view,change,before", it);
-          }
-
+ 
         if(fit != NULL && fit != it)
           {
              move_selected_box(wd, fit, it);
@@ -1169,6 +1163,14 @@ selected_box(Elm_Controlbar_Item * it)
              edje_object_signal_emit(_EDJ(wd->cur_item->base_item), "elm,state,shadow_show", "elm");
           }
 
+        if(fit != it)
+          {
+//             it->default_selected = EINA_FALSE;
+             if(wd->more_item != it)
+                evas_object_smart_callback_call(it->obj, "view,change,before", it);
+          }
+
+
         /*
            if(fit != NULL && fit != it)
            {
@@ -1770,7 +1772,7 @@ create_tab_item(Evas_Object * obj, const char *icon_path, const char *label,
    it->text = eina_stringshare_add(label);
    it->icon_path = eina_stringshare_add(icon_path);
    it->selected = EINA_FALSE;
-   it->default_selected = EINA_FALSE;
+   //it->default_selected = EINA_FALSE;
    //   it->editable = EINA_TRUE;
    it->badge = 0;
    it->sel = 1;
@@ -2338,12 +2340,11 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_append(Evas_Object * obj,
    wd->items = eina_list_append(wd->items, it);
    if(wd->more_item)
       elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
-   if (wd->num == 1)
+/*   if (wd->num == 1)
      {
         selected_box(it);
         it->default_selected = EINA_TRUE;
-     }
-
+     }*/
    _sizing_eval(obj);
    return it;
 }
@@ -2393,11 +2394,11 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_prepend(Evas_Object *
    wd->items = eina_list_prepend(wd->items, it);
    if(wd->more_item)
       elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
-   if (wd->num == 1)
+/*   if (wd->num == 1)
      {
         selected_box(it);
         it->default_selected = EINA_TRUE;
-     }
+     }*/
    _sizing_eval(obj);
    return it;
 }
@@ -2453,11 +2454,11 @@ elm_controlbar_tab_item_insert_before(Evas_Object * obj,
    wd->items = eina_list_prepend_relative(wd->items, it, before);
    if(wd->more_item)
       elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
-   if (wd->num == 1)
+/*   if (wd->num == 1)
      {
         selected_box(it);
         it->default_selected = EINA_TRUE;
-     }
+     }*/
    _sizing_eval(obj);
    return it;
 }
@@ -2514,11 +2515,11 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj,
    wd->items = eina_list_append_relative(wd->items, it, after);
    if(wd->more_item)
       elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
-   if (wd->num == 1)
+/*   if (wd->num == 1)
      {
         selected_box(it);
         it->default_selected = EINA_TRUE;
-     }
+     }*/
    _sizing_eval(obj);
    return it;
 }