[TM-162]issue related to checkbox resolved

Change-Id: I410eb67b1f3b297b48dd90adeb4bf8fd6384096d
Signed-off-by: Shashank Mishra <ss.mishra@samsung.com>

diff --git a/src/widget/mp-album-detail-list.c b/src/widget/mp-album-detail-list.c
index 13d223070b0eec34b11c932d7b2ec2745f16b8be..1e75ba4d2b43537601df35afa0134ad340950781 100755 (executable)
--- a/src/widget/mp-album-detail-list.c
+++ b/src/widget/mp-album-detail-list.c
@@ -162,9 +162,7 @@ _mp_album_detail_list_icon_get(void *data, Evas_Object * obj, const char *part)
                // if edit mode
                if (!strcmp(part, "elm.swallow.end")) {
                        // swallow checkbox or radio button
-                       Evas_Object *content = NULL;
                        Evas_Object *icon = NULL;
-                       content = elm_layout_add(obj);
 
                        icon = elm_check_add(obj);
                        elm_object_style_set(icon, "default");
@@ -172,7 +170,7 @@ _mp_album_detail_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_smart_callback_add(icon, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(icon, &item->checked);
 
-                       return content;
+                       return icon;
                }
        }
 

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index 54e8623b378a9a9f355ccd3514c559e001c680da..b427d6c05ba6ae30c427ac8878b7ec84560db5a1 100755 (executable)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -133,6 +133,7 @@ _mp_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
                elm_layout_theme_set(content, "layout", "list/B/music.type.1", "default");
                evas_object_resize(content, w, h);
                elm_layout_content_set(content, "elm.swallow.content", icon);
+               return content;
        }
 
        MpAlbumList_t *list = evas_object_data_get(obj, "list_handle");
@@ -176,11 +177,11 @@ _mp_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
-                       return content;
+                       return check;
                }
        }
 
-       return content;
+       return NULL;
 }
 
 static void

diff --git a/src/widget/mp-artist-detail-list.c b/src/widget/mp-artist-detail-list.c
index 7746c01ba3b6fee3b6e41b9be7f61552b9476c4e..02baa6c9d85250f486a0c7cc5c75568f42520b58 100755 (executable)
--- a/src/widget/mp-artist-detail-list.c
+++ b/src/widget/mp-artist-detail-list.c
@@ -136,15 +136,13 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
        }
        if (list->edit_mode) {
                if (!strcmp(part, "elm.swallow.end")) {
-                       content = elm_layout_add(obj);
-
                        icon = elm_check_add(obj);
                        elm_object_style_set(icon, "default");
                        evas_object_propagate_events_set(icon, EINA_FALSE);
                        elm_check_state_pointer_set(icon, &item->checked);
                        evas_object_smart_callback_add(icon, "changed", _mp_artist_detail_list_check_changed_cb, item);
 
-                       return content;
+                       return icon;
                }
        }
        return NULL;
@@ -301,10 +299,8 @@ _mp_artist_detail_list_track_icon_get(void *data, Evas_Object * obj, const char
        if (list->edit_mode) {
                // if edit mode
                DEBUG_TRACE("edit mode starts");
-               if (!strcmp(part, "elm.icon.2")) {              // swallow checkbox or radio button
-                       Evas_Object *content = NULL;
+               if (!strcmp(part, "elm.swallow.end")) {         // swallow checkbox or radio button
                        Evas_Object *icon = NULL;
-                       content = elm_layout_add(obj);
 
                        icon = elm_check_add(obj);
                        elm_object_style_set(icon, "default");
@@ -312,7 +308,7 @@ _mp_artist_detail_list_track_icon_get(void *data, Evas_Object * obj, const char
                        elm_check_state_pointer_set(icon, &item->checked);
                        evas_object_smart_callback_add(icon, "changed", _mp_artist_detail_list_check_changed_cb, item);
 
-                       return content;
+                       return icon;
                }
        }
        return NULL;

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index e27dc4e41252dbb30742c09a9e784ec3147b9d91..926b6b9ca2e86c94fb74b051cfa0aa56ec714e56 100755 (executable)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -193,14 +193,13 @@ _mp_artist_list_icon_get(void *data, Evas_Object *obj, const char *part)
        Evas_Object *check = NULL;
        if (list->edit_mode) {
                if (!strcmp(part, "elm.swallow.end")) {
-                       content = elm_layout_add(obj);
                        check = elm_check_add(obj);
                        elm_object_style_set(check, "default");
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
 
-                       return content;
+                       return check;
                }
        }
        return icon;

diff --git a/src/widget/mp-playlist-list.c b/src/widget/mp-playlist-list.c
index ff0eb3dedfd34dd51e71dd114f990b46e16382df..e42122ee038f08c4ae6562e96d1f23def07f3ca0 100755 (executable)
--- a/src/widget/mp-playlist-list.c
+++ b/src/widget/mp-playlist-list.c
@@ -381,7 +381,7 @@ _mp_playlist_list_icon_get(void *data, Evas_Object * obj, const char *part)
        MpPlaylistList_t *list = evas_object_data_get(obj, "list_handle");
        MP_CHECK_NULL(list);
        if (list->edit_mode) {
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        // swallow checkbox or radio button
                        check = elm_check_add(obj);
                        if (MP_LIST_OBJ_IS_GENGRID(obj)) {
@@ -392,9 +392,7 @@ _mp_playlist_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", check);
-                       return content;
+                       return check;
                }
        }
        return NULL;

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index 4f9485e61d80b374c26eff4d6372adf181674b82..0bb0a97349ecb4fd0e0ce8b5d5229efc2e82a9b9 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -219,7 +219,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
 
-                       return content;
+                       return check;
                }
        }
 
@@ -232,7 +232,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_size_hint_align_set(thumbnail, EVAS_HINT_FILL, EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(thumbnail, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-                       return content;
+                       return thumbnail;
                }
 
        }