diff options
author | Jehun Lim <jehun.lim@samsung.com> | 2015-12-09 11:33:27 +0900 |
---|---|---|
committer | Jehun Lim <jehun.lim@samsung.com> | 2015-12-09 11:35:32 +0900 |
commit | aebde7d87ba0fca4b24c775cc49b79b1b42c95e5 (patch) | |
tree | 7f24240d65ae43db92c4d1cfd1bddff395150bc0 /src | |
parent | 833c2d4d5711a90bae23d4a9b4c7344bbe5119a8 (diff) | |
download | air_mediahub-aebde7d87ba0fca4b24c775cc49b79b1b42c95e5.tar.gz air_mediahub-aebde7d87ba0fca4b24c775cc49b79b1b42c95e5.tar.bz2 air_mediahub-aebde7d87ba0fca4b24c775cc49b79b1b42c95e5.zip |
delete default picture image of video item
Change-Id: I13d8a6f752038dc50ee74562b31b9ede6feec6be
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/grid/grid_gallery.c | 12 | ||||
-rw-r--r-- | src/view/action_menu.c | 15 | ||||
-rw-r--r-- | src/view/detail.c | 12 |
3 files changed, 35 insertions, 4 deletions
diff --git a/src/grid/grid_gallery.c b/src/grid/grid_gallery.c index e9de31e..d579042 100644 --- a/src/grid/grid_gallery.c +++ b/src/grid/grid_gallery.c @@ -115,6 +115,18 @@ static Evas_Object *_media_content_get(void *data, _ERR("failed to create image object"); return NULL; } + } else if (!strcmp(part, PART_ELM_SWALLOW_PICTURE)) { + if (info->media_type != MEDIA_CONTENT_TYPE_IMAGE) + return NULL; + + if (info->thumbnail_path) + return NULL; + + eo = util_add_image(obj, IMAGE_THUMBNAIL_PICTURE); + if (!eo) { + _ERR("failed to create image object"); + return NULL; + } } else if (!strcmp(part, PART_ELM_SWALLOW_VIDEO)) { if (info->media_type != MEDIA_CONTENT_TYPE_VIDEO) return NULL; diff --git a/src/view/action_menu.c b/src/view/action_menu.c index 210d4f6..dbed15a 100644 --- a/src/view/action_menu.c +++ b/src/view/action_menu.c @@ -463,8 +463,16 @@ static Evas_Object *_grid_content_get(void *data, content = util_add_image(obj, info->thumbnail_path); if (!content) goto err; + } else if (!strcmp(part, PART_ELM_SWALLOW_PICTURE)) { + if (info->media_type != MEDIA_CONTENT_TYPE_IMAGE) + return NULL; - evas_object_show(content); + if (info->thumbnail_path) + return NULL; + + content = util_add_image(obj, IMAGE_THUMBNAIL_PICTURE); + if (!content) + goto err; } else if (!strcmp(part, PART_ELM_SWALLOW_VIDEO)) { if (info->media_type != MEDIA_CONTENT_TYPE_VIDEO) return NULL; @@ -472,8 +480,6 @@ static Evas_Object *_grid_content_get(void *data, content = util_add_image(obj, IMAGE_THUMBNAIL_PLAY); if (!content) goto err; - - evas_object_show(content); } else if (!strcmp(part, PART_ELM_SWALLOW_TEXTBG)) { content = evas_object_rectangle_add(obj); if (!content) @@ -481,9 +487,10 @@ static Evas_Object *_grid_content_get(void *data, app_contents_get_color(info->title, NULL, &bg); evas_object_color_set(content, bg.r, bg.g, bg.b, bg.a); + } + if (content) evas_object_show(content); - } return content; diff --git a/src/view/detail.c b/src/view/detail.c index 851450f..05a0326 100644 --- a/src/view/detail.c +++ b/src/view/detail.c @@ -465,6 +465,18 @@ static Evas_Object *_grid_content_get(void *data, Evas_Object *obj, app_contents_get_color(mi->title, NULL, &bg); evas_object_color_set(eo, bg.r, bg.g, bg.b, bg.a); + } else if (!strcmp(part, PART_ELM_SWALLOW_PICTURE)) { + if (mi->media_type != MEDIA_CONTENT_TYPE_IMAGE) + return NULL; + + if (mi->thumbnail_path) + return NULL; + + eo = util_add_image(obj, IMAGE_THUMBNAIL_PICTURE); + if (!eo) { + _ERR("failed to create image object"); + return NULL; + } } else if (!strcmp(part, PART_ELM_SWALLOW_VIDEO)) { if (mi->media_type != MEDIA_CONTENT_TYPE_VIDEO) return NULL; |