rotary_selector: remove unnecessary code

Change-Id: I47a12d413a4d6d3ef6678b89b032dcaf71d2ea18

diff --git a/src/wearable/efl_extension_rotary_selector.c b/src/wearable/efl_extension_rotary_selector.c
index 5d8ce95b79c69dfd4aff20d8756fd2de6342b0ba..5653e7cc1ff76af8d0de65aac7212829d8feab62 100644 (file)
--- a/src/wearable/efl_extension_rotary_selector.c
+++ b/src/wearable/efl_extension_rotary_selector.c
@@ -1136,7 +1136,6 @@ _event_area_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
              rsd->touched_item_changed = EINA_FALSE;
              rsd->pressed_item_index = _ROTARY_SELECTOR_PRESSED_ITEM_INDEX_INVALID;
              rsd->pressed = EINA_FALSE;
-             rsd->entering_edit_mode = EINA_FALSE;
 
              return;
           }
@@ -1201,35 +1200,32 @@ _event_area_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
                   int add_idx = eina_list_count(rsd->item_list) - 1;
                   if (rsd->editing)
                     {
-                       if (!rsd->entering_edit_mode)
+                       if (rsd->on_delete_icon)
                          {
-                            if (rsd->on_delete_icon)
-                              {
-                                 Eina_Bool still_on = _delete_icon_mouse_on_check(rsd, new_index, ev->canvas.x, ev->canvas.y);
-                                 if (still_on)
-                                   {
-                                      Eext_Rotary_Selector_Item *it = NULL;
-                                      it = eina_list_nth(rsd->item_list, new_index);
-                                      _delete_item(rsd, it);
-                                   }
-                              }
-                            else if (!rsd->add_enabled || (new_index != add_idx))
+                            Eina_Bool still_on = _delete_icon_mouse_on_check(rsd, new_index, ev->canvas.x, ev->canvas.y);
+                            if (still_on)
                               {
                                  Eext_Rotary_Selector_Item *it = NULL;
                                  it = eina_list_nth(rsd->item_list, new_index);
-                                 if (it->delete_enabled)
-                                   {
-                                      _delete_item(rsd, it);
-                                   }
+                                 _delete_item(rsd, it);
+                              }
+                         }
+                       else if (!rsd->add_enabled || (new_index != add_idx))
+                         {
+                            Eext_Rotary_Selector_Item *it = NULL;
+                            it = eina_list_nth(rsd->item_list, new_index);
+                            if (it->delete_enabled)
+                              {
+                                 _delete_item(rsd, it);
                               }
-                          else if (rsd->add_enabled && (new_index == add_idx))
-                            {
-                               _editing_mode_turnoff(rsd);
-                               evas_object_smart_callback_call(rsd->rotary_selector,
-                                                               "add_item,clicked", NULL);
-                               _item_touched_signal_send(rsd, add_idx, EINA_FALSE, EINA_TRUE);
-                            }
-                        }
+                         }
+                       else if (rsd->add_enabled && (new_index == add_idx))
+                         {
+                            _editing_mode_turnoff(rsd);
+                            evas_object_smart_callback_call(rsd->rotary_selector,
+                                                            "add_item,clicked", NULL);
+                            _item_touched_signal_send(rsd, add_idx, EINA_FALSE, EINA_TRUE);
+                         }
                     }
                   else
                     {
@@ -1255,7 +1251,6 @@ _event_area_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
    rsd->pressed = EINA_FALSE;
    rsd->touched_item_changed = EINA_FALSE;
    rsd->pressed_item_index = _ROTARY_SELECTOR_PRESSED_ITEM_INDEX_INVALID;
-   rsd->entering_edit_mode = EINA_FALSE;
 }
 
 static void
@@ -1904,8 +1899,6 @@ _editing_timer_cb(void *data)
    elm_layout_signal_emit(elm_object_part_content_get(rsd->rotary_selector, "content"),
                           "text1,show", "eext");
    rsd->editing = EINA_TRUE;
-   rsd->entering_edit_mode = EINA_TRUE;
-
 
    EINA_LIST_FOREACH(rsd->item_list, l, item)
      {