Merge "[scroller] bug fix for bounce"

diff --git a/TC/elm_ts/transit/Makefile b/TC/elm_ts/transit/Makefile
new file mode 100755 (executable)
index 0000000..cbab42a
--- /dev/null
+++ b/TC/elm_ts/transit/Makefile
@@ -0,0 +1,49 @@
+CC ?= gcc
+
+TARGETS = uts_elm_transit_add_func \
+         uts_elm_transit_auto_reverse_set_func \
+         uts_elm_transit_completion_callback_set_func \
+         uts_elm_transit_curve_style_set_func \
+         uts_elm_transit_del_func \
+         uts_elm_transit_event_block_disabled_get_func \
+         uts_elm_transit_event_block_disabled_set_func \
+         uts_elm_transit_fx_clear_func \
+         uts_elm_transit_fx_insert_func \
+         uts_elm_transit_pause_func \
+         uts_elm_transit_repeat_set_func \
+         uts_elm_transit_resume_func \
+         uts_elm_transit_run_func \
+         uts_elm_transit_stop_func \
+         uts_elm_transit_fx_blend_add_func \
+     uts_elm_transit_fx_color_add_func \
+     uts_elm_transit_fx_fade_add_func \
+         uts_elm_transit_fx_flip_add_func \
+         uts_elm_transit_fx_image_animation_add_func \
+     uts_elm_transit_fx_resizable_flip_add_func \
+     uts_elm_transit_fx_resizing_add_func \
+         uts_elm_transit_fx_rotation3d_add_func \
+     uts_elm_transit_fx_roation_add_func \
+         uts_elm_transit_fx_translation_add_func \
+         uts_elm_transit_fx_wipe_add_func \
+         uts_elm_transit_fx_zoom_add_func \
+
+PKGS = elementary
+
+LDFLAGS = `pkg-config --libs $(PKGS)`
+LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
+
+CFLAGS = -I. `pkg-config --cflags $(PKGS)`
+CFLAGS += -I$(TET_ROOT)/inc/tet3
+CFLAGS += -Wall
+
+all: $(TARGETS)
+
+$(TARGET): %: %.c
+       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+
+clean:
+       rm -f $(TARGETS)
+       rm -f tet_captured
+       rm -f *~

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
index 9a781cd..c090771 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
@@ -46,7 +46,6 @@ enum {
 
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_transit_add_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_transit_add_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -86,18 +85,3 @@ static void utc_UIFW_elm_transit_add_func_01(void)
        }
        tet_result(TET_PASS);
 }
-
-/**
- * @brief Negative test case of ug_init elm_transit_add()
- */
-static void utc_UIFW_elm_transit_add_func_02(void)
-{
-       transit = elm_transit_add(NULL);
-
-       if (transit) {
-               tet_infoline("elm_transit_add() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
index 8337494..65e555b 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
@@ -79,7 +79,7 @@ static void utc_UIFW_elm_transit_event_block_disbled_set_func_01(void)
 {
        Eina_Bool r = EINA_FALSE;
        
-       elm_transit_add(transit);
+       transit = elm_transit_add(main_win);
        elm_transit_event_block_disabled_set(transit, EINA_TRUE);
        r = elm_transit_event_block_disabled_get(transit);
        elm_transit_run(transit, 1.0);
@@ -99,12 +99,12 @@ static void utc_UIFW_elm_transit_event_block_disbled_set_func_02(void)
 {
        Eina_Bool r = EINA_FALSE;
        
-       elm_transit_add(transit);
+       elm_transit_add(main_win);
        elm_transit_event_block_disabled_set(NULL, EINA_TRUE);
-       r = elm_transit_event_block_disabled_get(transit);
+       r = elm_transit_event_block_disabled_get(NULL);
        elm_transit_run(transit, 1.0);
 
-       if (r = EINA_TRUE) {
+       if (r == EINA_TRUE) {
                tet_infoline("elm_transit_event_block_disbled_set() failed in negative test case");
                tet_result(TET_FAIL);
                return;

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
index 024fe84..fb2b9f5 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
@@ -102,7 +102,7 @@ static void utc_UIFW_elm_transit_fx_insert_func_02(void)
        Elm_Effect *effect = elm_fx_fade_add(main_win, main_win);
        r = elm_transit_fx_insert(transit, NULL);
 
-       if (r = EINA_TRUE) {
+       if (r == EINA_TRUE) {
                tet_infoline("elm_transit_fx_insert() failed in negative test case");
                tet_result(TET_FAIL);
                return;

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 22511df..6e0c740 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -83,18 +83,32 @@ test_calendar.c \
 test_diskselector.c \
 test_ctxpopup.c 
 
-elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_test_LDFLAGS =
 
 elementary_config_SOURCES = \
 config.c
 
-elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@
 elementary_config_LDFLAGS =
 
 if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
-elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_quicklaunch_LDFLAGS =
 
 if BUILD_RUN
@@ -115,7 +129,12 @@ elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
 elementary_testql_la_CFLAGS =
 elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
 elementary_testql_SOURCES = $(elementary_test_SOURCES)
-elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la
+elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =
 endif

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index f4f095d..1d7dde3 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1883,7 +1883,7 @@ extern "C" {
    EAPI void               elm_genlist_edit_selected_items_del(Evas_Object *obj);
    EAPI Eina_List         *elm_genlist_edit_selected_items_get(const Evas_Object *obj);
    EAPI void               elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it, Eina_Bool selected) EINA_ARG_NONNULL(1);
-   EAPI const Eina_Bool    elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);;
+   EAPI Eina_Bool          elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
    EAPI Evas_Object       *elm_genlist_item_rename_mode_set(Elm_Genlist_Item *it, int emode);
    EAPI void               elm_genlist_item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after );
    EAPI void               elm_genlist_item_move_before(Elm_Genlist_Item *it, Elm_Genlist_Item *before);

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index be14c12..5c51571 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -98,7 +98,6 @@ elm_colorselector.c \
 elm_colorpalette.c \
 elc_ctxpopup.c \
 elm_controlbar.c \
-elm_slidingdrawer.c \ 
 elm_dialoguegroup.c \
 elm_dayselector.c \
 elm_cnp_helper.c \
@@ -108,6 +107,7 @@ elm_nocontents.c \
 elm_tickernoti.c \
 elm_imageslider.c \
 elm_multibuttonentry.c \
+elm_slidingdrawer.c \
 elm_stackedicon.c \
 elm_calendar.c \
 elm_font.c \

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 40b20ee..4fc29ae 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6472,7 +6472,7 @@ elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it,
 }
 
 // TODO : add comment                              
-EAPI const Eina_Bool
+EAPI Eina_Bool
 elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index 1db16fd..b1b0c9f 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -42,6 +42,8 @@ static void _del_hook(Evas_Object *obj)
 static void _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   char buf[4096];
+
    if (!wd) return;
 
    _elm_theme_object_set(obj, wd->base, "searchbar", "base", elm_widget_style_get(obj));
@@ -51,6 +53,12 @@ static void _theme_hook(Evas_Object *obj)
    if (wd->cancel_btn)
      edje_object_part_swallow(wd->base, "button_cancel", wd->cancel_btn);
 
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->eb, buf);
+
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->cancel_btn, buf);
+
    edje_object_scale_set(wd->cancel_btn, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
@@ -127,15 +135,23 @@ static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_searchicon_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+_basebg_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
+
    if (!wd) return;
 
-   if (!strcmp(source, "search_icon"))
-     evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
-   else if (!strcmp(source, "base_bg"))
-     _clicked(data, obj, NULL); //emission, source);
+   if (!strcmp(source, "base_bg"))
+      _clicked(data, obj, NULL);
+}
+
+static void
+_searchsymbol_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+
+   if (!wd) return;
+   evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
 }
 
 /**
@@ -150,6 +166,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
    Evas_Object *obj;
    Evas *e;
    Widget_Data *wd;
+   char buf[4096];
 
    wd = ELM_NEW(Widget_Data);
    e = evas_object_evas_get(parent);
@@ -174,21 +191,27 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
 
    // Add Entry
    wd->eb = elm_editfield_add(parent);
-   elm_object_style_set(wd->eb, "searchbar");
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->eb, buf);
+
    edje_object_part_swallow(wd->base, "search_textfield", wd->eb);
 //   elm_editfield_guide_text_set(wd->eb, "Search");
    elm_editfield_entry_single_line_set(wd->eb, EINA_TRUE);
    elm_editfield_eraser_set(wd->eb, EINA_TRUE);
    evas_object_smart_callback_add(wd->eb, "clicked", _clicked, obj);
    evas_object_smart_callback_add(elm_editfield_entry_get(wd->eb), "changed", _changed, obj);
-   edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _searchicon_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _basebg_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "elm,action,click", "", _searchsymbol_clicked, obj);
 
    elm_widget_sub_object_add(obj, wd->eb);
 
    // Add Button
    wd->cancel_btn = elm_button_add(parent);
    edje_object_part_swallow(wd->base, "button_cancel", wd->cancel_btn);
-   elm_object_style_set(wd->cancel_btn, "custom/darkblue");
+
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->cancel_btn, buf);
+
    elm_button_label_set(wd->cancel_btn, "Cancel");
    evas_object_smart_callback_add(wd->cancel_btn, "clicked", _cancel_clicked, obj);
    elm_widget_sub_object_add(obj, wd->cancel_btn);

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 2143e41..ff635c7 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -218,16 +218,16 @@ elm_transit_event_block_disabled_set(Elm_Transit *transit, Eina_Bool disabled)
 
    if (disabled)
      {
-       if (transit->block_rect)
-         {
-            evas_object_del(transit->block_rect);
-            transit->block_rect = NULL;
-         }
+        if (transit->block_rect)
+          {
+             evas_object_del(transit->block_rect);
+             transit->block_rect = NULL;
+          }
      }
    else
      {
-       if (!transit->block_rect)
-          transit->block_rect = _create_block_rect(transit->parent);
+        if (!transit->block_rect)
+          transit->block_rect = _create_block_rect(transit->parent);
      }
 }
 
@@ -245,9 +245,8 @@ elm_transit_event_block_disabled_set(Elm_Transit *transit, Eina_Bool disabled)
 EAPI Eina_Bool
 elm_transit_event_block_disabled_get(const Elm_Transit *transit)
 {
-       ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE);
-   
-       return transit->block_rect ? EINA_TRUE : EINA_FALSE;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE);
+   return transit->block_rect ? EINA_FALSE : EINA_TRUE;
 }
 
 /**
@@ -449,6 +448,8 @@ elm_transit_tween_mode_get(const Elm_Transit *transit)
 EAPI Elm_Transit *
 elm_transit_add(Evas_Object *parent)
 {
+   if (!parent) return NULL;
+
    Elm_Transit *transit = ELM_NEW(Elm_Transit);
 
    if (!transit) return NULL;
@@ -520,13 +521,15 @@ elm_transit_fx_insert(Elm_Transit *transit, Elm_Effect *effect)
        
    Elm_Effect *_effect;
 
-       Eina_List *elist;
+   Eina_List *elist;
+
+   if (!effect) return EINA_FALSE;
 
    EINA_LIST_FOREACH(transit->effect_list, elist, _effect)
-   {
-      if (_effect == effect)
-        return EINA_FALSE;
-   }
+     {
+        if (_effect == effect)
+          return EINA_FALSE;
+     }
 
    ++effect->shared_cnt;
    transit->effect_list = eina_list_append(transit->effect_list, effect);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 31a5b39..355b7b8 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2293,7 +2293,7 @@ elm_win_indicator_state_get(Evas_Object *obj)
         unsigned int *prop_data = NULL;
 
         ret = ecore_x_window_prop_property_get (win->xwin,
-                    ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count);
+                    ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, (void *)&prop_data, &count);
         if( ret && prop_data )
            memcpy (&show, prop_data, sizeof (int));