efl_ui: fix build warnings of focus_manager functions

@tizen_fix

Change-Id: I6b8a4e5af21159367ee4cc70ba16b37d9d3c8a93

diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 8c21646..e41a995 100644 (file)
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -1189,6 +1189,11 @@ _efl_ui_calendar_item_day_number_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_
    return pd->v;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 EOLIAN static void
 _efl_ui_calendar_item_efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Calendar_Item_Data *pd, Eina_Bool focus)
 {
@@ -1210,4 +1215,8 @@ _efl_ui_calendar_item_efl_ui_focus_object_focus_parent_get(const Eo *obj, Efl_Ui
    return efl_parent_get(obj);
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_calendar_item.eo.c"

diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c
index 42ecc33..4bee1c4 100644 (file)
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -978,7 +978,7 @@ _efl_ui_collection_position_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Collec
   return pd->pos_man;
 }
 
-EOLIAN static Efl_Ui_Focus_Manager*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Manager*
 _efl_ui_collection_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj, Efl_Ui_Collection_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
 {
    Eo *man = efl_add(EFL_UI_COLLECTION_FOCUS_MANAGER_CLASS, obj,
@@ -989,7 +989,7 @@ _efl_ui_collection_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj, Efl
    return man;
 }
 
-EOLIAN static Eina_Bool
+EOLIAN EINA_UNUSED static Eina_Bool
 _efl_ui_collection_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Collection_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED)
 {
    return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
@@ -1008,7 +1008,7 @@ _find_item(Eo *obj EINA_UNUSED, Efl_Ui_Collection_Data *pd EINA_UNUSED, Eo *focu
    return focused_element;
 }
 
-EOLIAN static Efl_Ui_Focus_Object*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Object*
 _efl_ui_collection_efl_ui_focus_manager_move(Eo *obj, Efl_Ui_Collection_Data *pd, Efl_Ui_Focus_Direction direction)
 {
    Eo *new_obj, *focus;
@@ -1230,7 +1230,7 @@ _assert_item_available(Eo *item, unsigned int new_id, Efl_Ui_Collection_Data *pd
    efl_gfx_entity_geometry_set(item, efl_ui_position_manager_entity_position_single_item(pd->pos_man, new_id));
 }
 
-EOLIAN static Efl_Ui_Focus_Object*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Object*
 _efl_ui_collection_focus_manager_efl_ui_focus_manager_request_move(Eo *obj, Efl_Ui_Collection_Focus_Manager_Data *pd, Efl_Ui_Focus_Direction direction, Efl_Ui_Focus_Object *child, Eina_Bool logical)
 {
    MY_DATA_GET(pd->collection, collection_pd);
@@ -1270,7 +1270,7 @@ _efl_ui_collection_focus_manager_efl_ui_focus_manager_request_move(Eo *obj, Efl_
 }
 
 
-EOLIAN static void
+EOLIAN EINA_UNUSED static void
 _efl_ui_collection_focus_manager_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_Ui_Collection_Focus_Manager_Data *pd, Efl_Ui_Focus_Object *focus)
 {
    MY_DATA_GET(pd->collection, collection_pd);

diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index e5cff42..746c242 100644 (file)
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -2111,6 +2111,11 @@ _efl_ui_collection_view_efl_ui_scrollable_match_content_set(Eo *obj, Efl_Ui_Coll
    flush_min_size(obj, pd);
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 EOLIAN static Efl_Ui_Focus_Manager *
 _efl_ui_collection_view_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj, Efl_Ui_Collection_View_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
 {
@@ -2351,4 +2356,8 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_request_move(Eo *obj,
    return new_item;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_collection_view_focus_manager.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c
index de38094..945d388 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -9,6 +9,11 @@
 #include "elm_priv.h"
 #include "efl_ui_focus_composition_adapter.eo.h"
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 #define MY_CLASS EFL_UI_FOCUS_COMPOSITION_MIXIN
 
 typedef struct {
@@ -311,5 +316,8 @@ _efl_ui_focus_composition_adapter_efl_ui_focus_object_focus_manager_get(const Eo
    return pd->manager;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
 
 #include "efl_ui_focus_composition_adapter.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index ccbe1d3..ee6e97a 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -8,6 +8,11 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 #define MY_CLASS EFL_UI_FOCUS_LAYER_MIXIN
 
 typedef struct {
@@ -176,4 +181,8 @@ _efl_ui_focus_layer_behaviour_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_
    *enable_on_visible = pd->enable_on_visible;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_focus_layer.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index efb67fc..408c560 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -9,6 +9,11 @@
 
 #include "efl_ui_focus_graph.h"
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 #define MY_CLASS EFL_UI_FOCUS_MANAGER_CALC_CLASS
 #define FOCUS_DATA(obj) Efl_Ui_Focus_Manager_Calc_Data *pd = efl_data_scope_get(obj, MY_CLASS);
 
@@ -2017,4 +2022,8 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_dirty_logic_unfreeze(Eo *obj, Ef
 #define EFL_UI_FOCUS_MANAGER_CALC_EXTRA_OPS \
    EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_focus_manager_calc_efl_object_dbg_info_get)
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_focus_manager_calc.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.c b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
index 2950700..f16824b 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
@@ -10,6 +10,11 @@
 
 #include "efl_ui_focus_composition_adapter.eo.h"
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 #define MY_CLASS EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS
 
 typedef struct {
@@ -22,6 +27,7 @@ typedef struct {
    Eina_Future *focus_transfer;
 } Efl_Ui_Focus_Manager_Root_Focus_Data;
 
+
 static Eina_Value
 _unregister_rect(Eo *obj, void *data EINA_UNUSED, const Eina_Value v EINA_UNUSED)
 {
@@ -248,4 +254,8 @@ _efl_ui_focus_manager_root_focus_efl_object_finalize(Eo *obj, Efl_Ui_Focus_Manag
    return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_focus_manager_root_focus.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.c b/src/lib/elementary/efl_ui_focus_manager_sub.c
index 7a2de74..3e3852d 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_manager_sub.c
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.c
@@ -243,7 +243,7 @@ _efl_ui_focus_manager_sub_efl_object_destructor(Eo *obj, Efl_Ui_Focus_Manager_Su
    efl_destructor(efl_super(obj, MY_CLASS));
 }
 
-EOLIAN static Efl_Ui_Focus_Object*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Object*
 _efl_ui_focus_manager_sub_efl_ui_focus_manager_move(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd, Efl_Ui_Focus_Direction direction)
 {
    Eo *target = efl_ui_focus_manager_move(efl_super(obj, MY_CLASS), direction);

diff --git a/src/lib/elementary/efl_ui_focus_object.c b/src/lib/elementary/efl_ui_focus_object.c
index 3c02b8c..6da0518 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_object.c
+++ b/src/lib/elementary/efl_ui_focus_object.c
@@ -16,6 +16,11 @@ typedef struct {
   Eina_Bool focus_geom_changed;
 } Efl_Ui_Focus_Object_Data;
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 EOLIAN static void
 _efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Focus_Object_Data *pd, Eina_Bool focus)
 {
@@ -115,4 +120,8 @@ _efl_ui_focus_object_efl_object_event_callback_call(Eo *obj, Efl_Ui_Focus_Object
    EFL_OBJECT_OP_FUNC(efl_event_callback_array_priority_add, _efl_ui_focus_object_efl_object_event_callback_array_priority_add), \
    EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_ui_focus_object_efl_object_event_callback_call) \
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 #include "efl_ui_focus_object.eo.c"

diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_standard.c b/src/lib/elementary/efl_ui_focus_parent_provider_standard.c
index 821d812..5a40305 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_parent_provider_standard.c
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_standard.c
@@ -9,7 +9,7 @@ typedef struct {
 
 } Efl_Ui_Focus_Parent_Provider_Standard_Data;
 
-EOLIAN static Efl_Ui_Focus_Object*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Object*
 _efl_ui_focus_parent_provider_standard_efl_ui_focus_parent_provider_find_logical_parent(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Parent_Provider_Standard_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *widget)
 {
    return elm_object_parent_widget_get(widget);

diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index 8099eb3..ad451f9 100644 (file)
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -9,13 +9,13 @@ typedef struct {
 
 } Efl_Ui_Focus_Util_Data;
 
-static void
+EINA_UNUSED static void
 _manager_changed(void *data, const Efl_Event *event EINA_UNUSED)
 {
    efl_ui_focus_util_focus(data);
 }
 
-static Eina_Bool
+EINA_UNUSED static Eina_Bool
 _can_take_focus(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *user)
 {
    if (efl_isa(user, EFL_UI_FOCUS_MANAGER_INTERFACE))
@@ -25,7 +25,7 @@ _can_take_focus(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *user)
 }
 
 EOLIAN static void
-_efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
+_efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user EINA_UNUSED)
 {
    //TIZEN_ONLY(20191021): disable focus manager
    return;
@@ -69,7 +69,7 @@ _efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
 }
 
 EOLIAN static Efl_Ui_Focus_Manager*
-_efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager)
+_efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager EINA_UNUSED)
 {
    //TIZEN_ONLY(20191021): disable focus manager
    return NULL;
@@ -83,7 +83,7 @@ _efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager)
 }
 
 EOLIAN static Efl_Ui_Focus_Direction
-_efl_ui_focus_util_direction_complement(Efl_Ui_Focus_Direction dir)
+_efl_ui_focus_util_direction_complement(Efl_Ui_Focus_Direction dir EINA_UNUSED)
 {
    //TIZEN_ONLY(20191021): disable focus manager
    return EFL_UI_FOCUS_DIRECTION_LAST;

diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index effce54..3e6ce60 100644 (file)
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -621,12 +621,12 @@ _efl_ui_panes_efl_ui_widget_focus_next(Eo *obj, Efl_Ui_Panes_Data *sd, Efl_Ui_Fo
      }
 
    /* Direction */
-   if (dir == ELM_FOCUS_PREVIOUS)
+   if (dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS)
      {
         chain[0] = right;
         chain[1] = left;
      }
-   else if (dir == ELM_FOCUS_NEXT)
+   else if (dir == EFL_UI_FOCUS_DIRECTION_NEXT)
      {
         chain[0] = left;
         chain[1] = right;

diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 8fe398b..42866b3 100644 (file)
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -424,7 +424,7 @@ _efl_ui_scroller_efl_ui_scrollable_match_content_set(Eo *obj EINA_UNUSED,
    efl_canvas_group_change(obj);
 }
 
-EOLIAN static Eina_Bool
+EOLIAN EINA_UNUSED static Eina_Bool
 _efl_ui_scroller_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Scroller_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED)
 {
    //undepended from logical or not we always reigster as full with ourself as redirect
@@ -432,7 +432,7 @@ _efl_ui_scroller_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Scroller_Data *
    return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
 }
 
-EOLIAN static Efl_Ui_Focus_Manager*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Manager*
 _efl_ui_scroller_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj, Efl_Ui_Scroller_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
 {
    Efl_Ui_Focus_Manager *manager;
@@ -526,7 +526,6 @@ _efl_ui_scroller_efl_ui_widget_focus_direction(Eo *obj, Efl_Ui_Scroller_Data *sd
         Evas_Coord c_x = 0, c_y = 0;
         Evas_Coord f_x = 0, f_y = 0, f_w = 0, f_h = 0;
         Evas_Coord l_x = 0, l_y = 0, l_w = 0, l_h = 0;
-        Evas_Coord step_x = 0, step_y = 0;
 
         ret = efl_ui_widget_focus_direction_get(cur, base, degree, direction, direction_item, weight);
 

diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 005da16..213c28e 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1968,7 +1968,7 @@ elm_widget_child_can_focus_get(const Eo *obj)
 }
 
 
-static int
+EINA_UNUSED static int
 _tree_unfocusable_counter_get(Eo *widget)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(widget, pd, -1);
@@ -3692,11 +3692,10 @@ _efl_ui_widget_focus_hide_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED
 EAPI void
 elm_widget_focus_mouse_up_handle(Eo *obj)
 {
-   Elm_Widget_Smart_Data *pd = efl_data_scope_get(obj, MY_CLASS);
-
    if (!_is_focusable(obj)) return;
 
    /* TIZEN_ONLY(20180607): Restore legacy focus
+   Elm_Widget_Smart_Data *pd = efl_data_scope_get(obj, MY_CLASS);
    if (pd->focus.manager && !pd->focus.logical)
      {
         efl_ui_focus_util_focus(obj);
@@ -5618,7 +5617,7 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
 #endif
 }
 
-static void
+EINA_UNUSED static void
 _focus_event_changed(void *data EINA_UNUSED, const Efl_Event *event)
 {
    if (efl_ui_focus_object_focus_get(event->object))
@@ -6114,6 +6113,11 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd
    return lookup;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+//
+
 EOLIAN static Efl_Ui_Focus_Manager*
 _efl_ui_widget_efl_ui_focus_object_focus_parent_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
 {
@@ -6149,6 +6153,10 @@ _efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
    return NULL;
 }
 
+//TIZEN_ONLY(20191205): fix build warnings of focus_manager functions
+#pragma GCC diagnostic pop
+//
+
 //TIZEN_ONLY(20160726): add API elm_object_part_access_object_get
 EOLIAN static Evas_Object*
 _efl_ui_widget_part_access_object_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *part EINA_UNUSED)
@@ -6185,11 +6193,39 @@ elm_widget_show_region_set(Eo *obj, Eina_Rect sr, Eina_Bool forceshow)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, sd);
 
+   /*****************************************************************************
+    * TIZEN_ONLY_FEATURE: Fix entry size/cursor/region calculation for Tizen UX *
+    *****************************************************************************
+    * Move this code to the below to update show region geometry properly.
    evas_smart_objects_calculate(evas_object_evas_get(obj));
+    */
+   /*******
+    * END *
+    *******/
 
    if (!forceshow && eina_rectangle_equal(&sr.rect, &sd->show_region.rect)) return;
 
    sd->show_region = sr;
+
+   /*****************************************************************************
+    * TIZEN_ONLY_FEATURE: Fix entry size/cursor/region calculation for Tizen UX *
+    *****************************************************************************/
+   /* Block nested call for evas_smart_objects_calculate() and region showing works */
+   if (sd->on_show_region_set) return;
+
+   sd->on_show_region_set = EINA_TRUE;
+
+   evas_smart_objects_calculate(evas_object_evas_get(obj));
+
+   sd->on_show_region_set = EINA_FALSE;
+
+   /* show_region geometry could be changed during processing elm_widget_show_region_set().
+      evas_smart_objects_calculate() can trigger nested show_region_set calls */
+   sr = sd->show_region;
+   /*******
+    * END *
+    *******/
+
    if (sd->on_show_region)
      {
         sd->on_show_region(sd->on_show_region_data, obj, sr);
@@ -10225,98 +10261,7 @@ _efl_ui_widget_focus_restore(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
    if (newest)
      _parents_on_focus(newest);
 }
-//END
-
-
-EOLIAN static void
-_efl_ui_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow)
-{
-   Evas_Object *parent_obj, *child_obj;
-   Evas_Coord px, py, cx, cy, nx = 0, ny = 0;
-
-   /*****************************************************************************
-    * TIZEN_ONLY_FEATURE: Fix entry size/cursor/region calculation for Tizen UX *
-    *****************************************************************************
-    * Move this code to the below to update show region geometry properly.
-   evas_smart_objects_calculate(evas_object_evas_get(obj));
-    */
-   /*******
-    * END *
-    *******/
-
-   if (!forceshow && eina_rectangle_equal(&sr.rect, &sd->show_region.rect)) return;
-
-   sd->show_region = sr;
-
-   /*****************************************************************************
-    * TIZEN_ONLY_FEATURE: Fix entry size/cursor/region calculation for Tizen UX *
-    *****************************************************************************/
-   /* Block nested call for evas_smart_objects_calculate() and region showing works */
-   if (sd->on_show_region_set) return;
 
-   sd->on_show_region_set = EINA_TRUE;
-
-   evas_smart_objects_calculate(evas_object_evas_get(obj));
-
-   sd->on_show_region_set = EINA_FALSE;
-
-   /* show_region geometry could be changed during processing elm_widget_show_region_set().
-      evas_smart_objects_calculate() can trigger nested show_region_set calls */
-   sr = sd->show_region;
-   /*******
-    * END *
-    *******/
-
-   if (sd->on_show_region)
-     {
-        sd->on_show_region(sd->on_show_region_data, obj, sr);
-
-        if (_elm_scrollable_is(obj))
-          {
-             if (elm_widget_is_legacy(obj))
-               {
-                  elm_interface_scrollable_content_pos_get(obj, &nx, &ny);
-                  sr.x -= nx;
-                  sr.y -= ny;
-               }
-             else
-               {
-                  Eina_Position2D pos;
-                  pos = efl_ui_scrollable_content_pos_get(obj);
-                  sr.x -= pos.x;
-                  sr.y -= pos.y;
-               }
-          }
-     }
-
-   child_obj = obj;
-   do
-     {
-        parent_obj = sd->parent_obj;
-        if ((!parent_obj) || (!_elm_widget_is(parent_obj))) break;
-        sd = efl_data_scope_get(parent_obj, MY_CLASS);
-        if (!sd) break;
-
-        evas_object_geometry_get(parent_obj, &px, &py, NULL, NULL);
-        evas_object_geometry_get(child_obj, &cx, &cy, NULL, NULL);
-
-        sr.x += (cx - px);
-        sr.y += (cy - py);
-        sd->show_region = sr;
-
-        if (sd->on_show_region)
-          sd->on_show_region(sd->on_show_region_data, parent_obj, sr);
-     }
-   while (parent_obj);
-}
-
-EOLIAN static Eina_Rect
-_efl_ui_widget_show_region_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
-{
-   return (Eina_Rect) sd->show_region;
-}
-
-//TIZEN_ONLY(20180607): Restore legacy focus
 /**
  * @internal
  *
@@ -10385,7 +10330,8 @@ _elm_object_focus_chain_del_cb(void *data,
 
    sd->focus_chain = eina_list_remove(sd->focus_chain, obj);
 }
-//
+//END
+
 #include "elm_widget_item_eo.c"
 #include "elm_widget_item_container_eo.c"
 #include "efl_ui_widget.eo.c"

diff --git a/src/lib/elementary/efl_ui_widget_focus_manager.c b/src/lib/elementary/efl_ui_widget_focus_manager.c
index 2e14ce7..2628284 100644 (file)
--- a/src/lib/elementary/efl_ui_widget_focus_manager.c
+++ b/src/lib/elementary/efl_ui_widget_focus_manager.c
@@ -17,7 +17,7 @@ typedef struct
 } Efl_Ui_Widget_Focus_Manager_Data;
 
 EOLIAN static Efl_Object*
-_efl_ui_widget_focus_manager_efl_object_constructor(Eo *obj, Efl_Ui_Widget_Focus_Manager_Data *pd)
+_efl_ui_widget_focus_manager_efl_object_constructor(Eo *obj, Efl_Ui_Widget_Focus_Manager_Data *pd EINA_UNUSED)
 {
    Eo *res = NULL;
 
@@ -37,7 +37,7 @@ _efl_ui_widget_focus_manager_efl_object_constructor(Eo *obj, Efl_Ui_Widget_Focus
 }
 
 EOLIAN static void
-_efl_ui_widget_focus_manager_efl_object_destructor(Eo *obj, Efl_Ui_Widget_Focus_Manager_Data *pd)
+_efl_ui_widget_focus_manager_efl_object_destructor(Eo *obj, Efl_Ui_Widget_Focus_Manager_Data *pd EINA_UNUSED)
 {
    efl_destructor(efl_super(obj, MY_CLASS));
 
@@ -48,7 +48,7 @@ _efl_ui_widget_focus_manager_efl_object_destructor(Eo *obj, Efl_Ui_Widget_Focus_
    */
 }
 
-EOLIAN static Eina_Bool
+EOLIAN EINA_UNUSED static Eina_Bool
 _efl_ui_widget_focus_manager_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Widget_Focus_Manager_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect)
 {
    Eina_Bool state;

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 926ae11..e682792 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6879,7 +6879,7 @@ _efl_ui_win_efl_canvas_object_legacy_ctor(Eo *obj, Efl_Ui_Win_Data *sd)
    sd->legacy.ctor = EINA_TRUE;
 }
 
-EOLIAN static Efl_Ui_Focus_Manager*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Manager*
 _efl_ui_win_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
 {
    Efl_Ui_Focus_Manager *manager;
@@ -7991,7 +7991,7 @@ _efl_ui_win_indicator_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EI
    return sd->indimode;
 }
 
-EOLIAN static Eina_Bool
+EOLIAN EINA_UNUSED static Eina_Bool
 _efl_ui_win_efl_ui_focus_object_focus_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    // Bypass widget implementation here.

diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 76e09ef..5c388eb 100644 (file)
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1970,7 +1970,7 @@ _legacy_focused(void *data, const Efl_Event *ev)
      }
 }
 
-static void
+EINA_UNUSED static void
 _legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
 {
    efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _legacy_focused, ev->object);

diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index 2479b01..289abbe 100644 (file)
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -35,7 +35,7 @@
 
 
 
-static Eina_List*
+EINA_UNUSED static Eina_List*
 _custom_chain_get(const Efl_Ui_Widget *node)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(node, pd, NULL);
@@ -70,7 +70,7 @@ _manager_changed(void *data EINA_UNUSED, const Efl_Event *ev)
    _flush_manager(ev->object, pd);
 }
 
-static void
+EINA_UNUSED static void
 _custom_chain_set(Efl_Ui_Widget *node, Eina_List *lst)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(node, pd);
@@ -202,7 +202,7 @@ elm_object_focus_cycle(Evas_Object        *obj,
    elm_object_focus_next(obj, dir);
 }
 
-static Evas_Object*
+EINA_UNUSED static Evas_Object*
 _get_legacy_target(EINA_UNUSED Evas_Object *eo, Elm_Widget_Smart_Data *pd, Elm_Focus_Direction dir)
 {
    Evas_Object *result = NULL;
@@ -221,7 +221,7 @@ _get_legacy_target(EINA_UNUSED Evas_Object *eo, Elm_Widget_Smart_Data *pd, Elm_F
    return result;
 }
 
-static Eina_Array*
+EINA_UNUSED static Eina_Array*
 _focus_parent_chain_gen(Efl_Ui_Focus_Object *obj)
 {
    Eina_Array *result = eina_array_new(5);

diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 04779ca..0368c53 100644 (file)
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3751,7 +3751,7 @@ static Eina_Bool _elm_genlist_smart_focus_next_enable = EINA_FALSE;
 
 //TIZEN_ONLY(20180607): Restore legacy focus
 EOLIAN static Eina_Bool
-_elm_genlist_efl_ui_widget_focus_next_manager_is(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSED)
+_elm_genlist_efl_ui_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Genlist_Data *_pd EINA_UNUSED)
 {
    return _elm_genlist_smart_focus_next_enable;
 }

diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 25c5821..53d9126 100644 (file)
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -5583,7 +5583,7 @@ _elm_interface_scrollable_class_constructor(Efl_Class *klass)
 EAPI void elm_pan_gravity_set(Elm_Pan *obj EINA_UNUSED, double x EINA_UNUSED, double y EINA_UNUSED) {}
 EAPI void elm_pan_gravity_get(const Elm_Pan *obj EINA_UNUSED, double *x EINA_UNUSED, double *y EINA_UNUSED) {}
 
-EOLIAN static Efl_Ui_Focus_Manager*
+EOLIAN EINA_UNUSED static Efl_Ui_Focus_Manager*
 _elm_interface_scrollable_efl_ui_widget_focus_manager_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
 {
    Efl_Ui_Focus_Manager *manager;
@@ -5624,7 +5624,7 @@ _filter_cb(const void *iterator EINA_UNUSED, void *data, void *fdata)
    return inside;
 }
 
-EOLIAN static Eina_Iterator*
+EOLIAN EINA_UNUSED static Eina_Iterator*
 _elm_interface_scrollable_efl_ui_focus_manager_border_elements_get(const Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED)
 {
    Eina_Iterator *border_elements;

diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c
index 008403c..da9e077 100644 (file)
--- a/src/lib/elementary_tizen/elm_genlist.c
+++ b/src/lib/elementary_tizen/elm_genlist.c
@@ -9699,19 +9699,19 @@ _elm_genlist_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlis
 }
 
 EOLIAN static Efl_Object*
-_elm_genlist_efl_object_provider_find(const Eo *obj, Elm_Genlist_Data *pd, const Efl_Object *klass)
+_elm_genlist_efl_object_provider_find(const Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, const Efl_Object *klass)
 {
    return efl_provider_find(efl_super(obj, ELM_GENLIST_CLASS), klass);
 }
 
 EOLIAN static void
-_elm_genlist_item_efl_ui_focus_object_setup_order_non_recursive(Eo *obj, Elm_Gen_Item *pd)
+_elm_genlist_item_efl_ui_focus_object_setup_order_non_recursive(Eo *obj EINA_UNUSED, Elm_Gen_Item *pd EINA_UNUSED)
 {
    return;
 }
 
 EOLIAN static Eina_Bool
-_elm_genlist_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED)
+_elm_genlist_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Efl_Ui_Widget *redirect EINA_UNUSED)
 {
    return EINA_FALSE;
 }