Revert "genlist: fix translataion issue" 54/191854/1
authorSangHyeon Lee <sh10233.lee@samsung.com>
Wed, 24 Oct 2018 11:29:43 +0000 (11:29 +0000)
committerSangHyeon Lee <sh10233.lee@samsung.com>
Wed, 24 Oct 2018 11:29:43 +0000 (11:29 +0000)
This reverts commit 6fdcd3f58045278e25c7334714eddd2e481eee64.

Change-Id: I9d163c81edacccc88d6565fd84b7341a33031b2a

src/lib/elementary/elm_genlist.c
src/lib/elementary/elm_genlist.eo
src/lib/elementary_tizen/elm_genlist.c

index 7120f40..d2f4455 100644 (file)
@@ -12,7 +12,6 @@
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 #define ELM_WIDGET_ITEM_PROTECTED
 #define EFL_UI_FOCUS_COMPOSITION_PROTECTED
-#define EFL_UI_TRANSLATABLE_PROTECTED
 
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
@@ -9123,43 +9122,6 @@ _elm_genlist_efl_ui_widget_focused_item_get(const Eo *obj EINA_UNUSED, Elm_Genli
 }
 
 EOLIAN static void
-_elm_genlist_efl_ui_translatable_translation_update(Eo *obj, Elm_Genlist_Data *sd)
-{
-   Item_Block *itb;
-
-   // Before calling text_get, inform user first.
-   // FIXME
-   //evas_object_smart_callback_call(obj, SIG_LANG_CHANGED, NULL);
-
-   // FIXME: We should change item's height if lang is changed??
-   EINA_INLIST_FOREACH(sd->blocks, itb)
-     {
-        Eina_List *l;
-        Elm_Gen_Item *it;
-        EINA_LIST_FOREACH(itb->items, l, it)
-          {
-             if (it->realized)
-               {
-                  elm_genlist_item_fields_update(EO_OBJ(it),
-                                                 NULL,
-                                                 ELM_GENLIST_ITEM_FIELD_TEXT |
-                                                 ELM_GENLIST_ITEM_FIELD_CONTENT);
-               }
-             // FIXME
-             //else GL_IT(it)->calc_done = EINA_FALSE;
-          }
-        // FIXME
-        //itb->calc_done = EINA_FALSE;
-     }
-
-   eina_hash_free_buckets(sd->size_caches);
-   // FIXME
-   //sd->calc_done = EINA_FALSE;
-
-   efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS));
-}
-
-EOLIAN static void
 _elm_genlist_elm_interface_scrollable_item_loop_enabled_set(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Eina_Bool enable)
 {
    sd->item_loop_enable = !!enable;
index 4022b73..061f117 100644 (file)
@@ -670,7 +670,6 @@ class Elm.Genlist (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
       Efl.Gfx.Entity.size { set; }
       Efl.Canvas.Group.group_member_add;
       Efl.Object.provider_find;
-      Efl.Ui.Translatable.translation_update;
       Efl.Ui.Widget.theme_apply;
       Efl.Ui.Widget.widget_sub_object_add;
       Efl.Ui.Widget.widget_sub_object_del;
index cd58179..414fea4 100644 (file)
@@ -12,7 +12,6 @@
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 #define ELM_WIDGET_ITEM_PROTECTED
 #define EFL_UI_FOCUS_COMPOSITION_PROTECTED
-#define EFL_UI_TRANSLATABLE_PROTECTED
 
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
@@ -4651,8 +4650,8 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
    elm_interface_scrollable_content_region_show(obj, r.x, r.y, r.w, r.h);
 }
 
-EOLIAN static void
-_elm_genlist_efl_ui_translatable_translation_update(Eo *obj, Elm_Genlist_Data *sd)
+EOLIAN static Eina_Bool
+_elm_genlist_efl_ui_widget_translate(Eo *obj, Elm_Genlist_Data *sd)
 {
    Item_Block *itb;
 
@@ -4681,7 +4680,7 @@ _elm_genlist_efl_ui_translatable_translation_update(Eo *obj, Elm_Genlist_Data *s
    eina_hash_free_buckets(sd->size_caches);
    sd->calc_done = EINA_FALSE;
 
-   efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS));
+   return EINA_TRUE;
 }
 
 EOLIAN static void