[scroller] added API for events propagation

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index f07d9cb..344310a 100755 (executable)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -519,6 +519,7 @@ extern "C" {
    EAPI void         elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
    EAPI void         elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    EAPI void         elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set);
+   EAPI void         elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool set);
 
    /* smart callbacks called:
     * "edge,left"
@@ -1607,7 +1608,6 @@ extern "C" {
    EAPI Eina_Bool    elm_scrolled_entry_password_get(const Evas_Object *obj);
    EAPI void         elm_scrolled_entry_entry_set(Evas_Object *obj, const char *entry);
    EAPI const char  *elm_scrolled_entry_entry_get(const Evas_Object *obj);
-   EAPI Evas_Object *elm_scrolled_entry_entry_object_get(const Evas_Object *obj);
    EAPI const char  *elm_scrolled_entry_selection_get(const Evas_Object *obj);
    EAPI void         elm_scrolled_entry_entry_insert(Evas_Object *obj, const char *entry);
    EAPI void         elm_scrolled_entry_line_wrap_set(Evas_Object *obj, Eina_Bool wrap);

diff --git a/src/lib/elc_scrolled_entry.c b/src/lib/elc_scrolled_entry.c
index d5b7904..876d7b1 100644 (file)
--- a/src/lib/elc_scrolled_entry.c
+++ b/src/lib/elc_scrolled_entry.c
@@ -265,6 +265,7 @@ elm_scrolled_entry_add(Evas_Object *parent)
    wd->scroller = elm_scroller_add(parent);
    elm_widget_resize_object_set(obj, wd->scroller);
    elm_scroller_bounce_set(wd->scroller, 0, 0);
+   elm_scroller_propagate_events_set(wd->scroller, 1);
    
    wd->entry = elm_entry_add(parent);
    evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -423,23 +424,6 @@ elm_scrolled_entry_entry_get(const Evas_Object *obj)
 }
 
 /**
- * This returns the entry object.
- *
- * @param obj The scrolled entry object
- * @return The entry object or NULL on failure
- *
- * @ingroup Scrolled_Entry
- */
-EAPI Evas_Object *
-elm_scrolled_entry_entry_object_get(const Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   return wd->entry;
-}
-
-/**
  * This returns all selected text within the scrolled entry.
  *
  * @param obj The scrolled entry object

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index f2a5cea..e2ec6a3 100755 (executable)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -669,3 +669,20 @@ elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set)
 
    elm_smart_scroller_page_move_set(wd->scr, set);
 }
+
+/**
+ * Set events propagation
+ *
+ * @param obj The scroller object
+ * @param set Flag
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool set)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   evas_object_propagate_events_set(wd->scr, set);
+}