elm_colorselector: changed item selection procedure to handle by _on_color_selected()

Deleted duplicate item selection procedure code
in _elm_color_item_selected_set() and _item_action_activate()

@tizen_fix

Change-Id: I607658ec651f393ca3658c2746c11ecc7a841d41
Signed-off-by: JEONGHYUN YUN <jh0506.yun@samsung.com>

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index fe1eff6f14a6d3970b52140fc8830768a249035e..e66b10d70aba93775512c33d9849c5e1ee4d1f3f 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1675,11 +1675,6 @@ _on_color_selected(void *data,
 
    ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);
 
-   elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
-                               item->color->b, item->color->a);
-   eo_do(WIDGET(item), eo_event_callback_call
-     (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item)));
-
    eo_temp_item = eina_list_data_get(sd->selected);
    if (eo_temp_item && (eo_temp_item != EO_OBJ(item)))
      {
@@ -1693,6 +1688,11 @@ _on_color_selected(void *data,
         if (item == temp_item) sd->selected = l;
      }
    sd->focused = ELM_COLORSELECTOR_PALETTE;
+
+   elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
+                               item->color->b, item->color->a);
+   eo_do(WIDGET(item), eo_event_callback_call
+     (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item)));
 }
 //
 
@@ -1769,9 +1769,12 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED,
 static Eina_Bool
 _item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   Eina_List *l;
+   // TIZEN_ONLY(20170719): item selection procedure is handled by _on_color_selected()
+   /*Eina_List *l;
    ELM_COLOR_ITEM_DATA_GET(obj, item);
-   ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);
+   ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);*/
+   ELM_COLOR_ITEM_DATA_GET(obj, item);
+   //
 
    elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
    //TIZEN_ONLY(20160701): send selected signal
@@ -1780,7 +1783,8 @@ _item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
                                                               ELM_ATSPI_STATE_CHECKED,
                                                               EINA_TRUE);
    //
-   elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
+   // TIZEN_ONLY(20170719): item selection procedure is handled by _on_color_selected()
+   /*elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
                                item->color->b, item->color->a);
    evas_object_smart_callback_call(WIDGET(item), SIG_COLOR_ITEM_SELECTED,
                                    EO_OBJ(item));
@@ -1797,7 +1801,8 @@ _item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
         ELM_COLOR_ITEM_DATA_GET(eo_temp_item, temp_item);
         if (item == temp_item) sd->selected = l;
      }
-   sd->focused = ELM_COLORSELECTOR_PALETTE;
+   sd->focused = ELM_COLORSELECTOR_PALETTE;*/
+   //
 
    return EINA_TRUE;
 }
@@ -2599,7 +2604,9 @@ _elm_color_item_selected_set(Eo *eo_item,
                              Eina_Bool selected)
 {
    Eo *eo_temp_item;
+   /* TIZEN_ONLY(20170719): item selection procedure is handled by _on_color_selected()
    Eina_List *l;
+   */
 
    ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);
 
@@ -2618,7 +2625,8 @@ _elm_color_item_selected_set(Eo *eo_item,
    if (selected)
      {
         elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
-        elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
+        // TIZEN_ONLY(20170719): item selection procedure is handled by _on_color_selected()
+        /*elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
                                     item->color->b, item->color->a);
         if (eo_temp_item)
           {
@@ -2631,7 +2639,9 @@ _elm_color_item_selected_set(Eo *eo_item,
 
         elm_object_signal_emit(VIEW(item), "elm,anim,activate", "elm");
         eo_do(WIDGET(item), eo_event_callback_call
-          (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item));
+          (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item));*/
+        elm_object_signal_emit(VIEW(item), "elm,anim,activate", "elm");
+        //
      }
 }