From: Yeongjong Lee <yj34.lee@samsung.com>
Date: Sun, 8 Dec 2019 22:50:33 +0000 (+0900)
Subject: efl_ui_widget: restore legacy focus of scrollable
X-Git-Tag: accepted/tizen/unified/20191210.141144~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F219640%2F1;p=platform%2Fupstream%2Fefl.git

efl_ui_widget: restore legacy focus of scrollable

restore legacy focus calculation removed from the commit below.

ref e337c53348829799e0dcac26af50e988e1b759a8

@tizen_fix

Change-Id: I08e182697795451a3381038995163df420900d1f
---

diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 2820fbf..3cbe41e 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1247,8 +1247,25 @@ elm_widget_focus_region_show(Eo *obj)
              Evas_Coord sx, sy;
              Evas_Coord vx, vy;
 
-             elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL);
-             elm_interface_scrollable_content_viewport_geometry_get(o, &vx, &vy, NULL, NULL);
+             //TIZEN_ONLY(202191209): restore legacy focus of scrollable
+             if (elm_widget_is_legacy(o))
+               {
+                  elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL);
+                  elm_interface_scrollable_content_viewport_geometry_get(o, &vx, &vy, NULL, NULL);
+               }
+             else
+               {
+                  Eina_Position2D pos = efl_ui_scrollable_content_pos_get(o);
+                  Eina_Rect rect = efl_ui_scrollable_viewport_geometry_get(o);
+                  sx = pos.x;
+                  sy = pos.y;
+                  vx = rect.x;
+                  vy = rect.y;
+               }
+
+             //elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL);
+             //elm_interface_scrollable_content_viewport_geometry_get(o, &vx, &vy, NULL, NULL);
+             //
 
              // Get the object's on_focus_region position relative to the pan in the scroller.
              Evas_Coord rx, ry;