efl_ui_widget, elc

_popup : disable auto scroll function for popup scroller

Change-Id: I8873c13f4929787ee4c359c7c82a87f45c2dcd64

diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 32e9353..6030923 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1291,7 +1291,13 @@ elm_widget_focus_region_show(Eo *obj)
                {
                 case ELM_FOCUS_AUTOSCROLL_MODE_SHOW:
                    if (elm_widget_is_legacy(o))
-                     elm_interface_scrollable_content_region_show(o, rx, ry, r.w, r.h);
+                     //TIZEN_ONLY(20200917): disable auto scroll
+                     {
+                       int popup_data = evas_object_data_get(o, "popup_scroll");
+                       if (!popup_data)
+                         elm_interface_scrollable_content_region_show(o, rx, ry, r.w, r.h);
+                     }
+                     //
                    else
                      efl_ui_scrollable_scroll(o, r, EINA_FALSE);
                    break;

diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 45123bf..8ba0b6d 100644 (file)
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1059,6 +1059,10 @@ _create_scroller(Evas_Object *obj)
 
    //Scroller
    sd->scr = elm_scroller_add(sd->tbl);
+   //TIZEN_ONLY(20200917): disable auto scroll
+   evas_object_data_set(sd->scr, "popup_scroll", 1);
+   //
+
    //TIZEN_ONLY(20200227): Support eext popup
    evas_object_data_set(obj, "popup_scroller", sd->scr);
    //