[ctxpopup] open source merge r67011

Change-Id: I5666d215152451a8399114a7c0ed580c89137e37

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f11da6a..28c7338 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1,6 +1,5 @@
 #include <Elementary.h>
 #include "elm_priv.h"
-#include "els_scroller.h"
 
 #undef Elm_Ctxpopup_Item
 
@@ -152,7 +151,7 @@ _freeze_on(void *data __UNUSED__, Evas_Object *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if ((!wd) || (!wd->scr)) return;
-   elm_smart_scroller_freeze_set(wd->scr, EINA_TRUE);
+   elm_object_scroll_freeze_push(wd->scr);
 }
 
 static void
@@ -162,7 +161,7 @@ _freeze_off(void *data __UNUSED__, Evas_Object *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if ((!wd) || (!wd->scr)) return;
-   elm_smart_scroller_freeze_set(wd->scr, EINA_FALSE);
+   elm_object_scroll_freeze_pop(wd->scr);
 }
 
 static void

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 6e8b044..280ac89 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2239,10 +2239,10 @@ elm_widget_scroll_freeze_pop(Evas_Object *obj)
 {
    API_ENTRY return;
    sd->scroll_freeze--;
-   if (sd->scroll_freeze < 0) sd->scroll_freeze = 0;
    if (!sd->scroll_freeze)
      evas_object_smart_callback_call(obj, "scroll-freeze-off", obj);
    if (sd->parent_obj) elm_widget_scroll_freeze_pop(sd->parent_obj);
+   if (sd->scroll_freeze < 0) sd->scroll_freeze = 0;
 }
 
 EAPI int