From c19a32db7ee606914cac53ef111f65f1543bfd9c Mon Sep 17 00:00:00 2001 From: Sangpyo Kim Date: Fri, 24 Aug 2012 19:47:31 +0900 Subject: [PATCH] [Title] replacing the evas image to elm icon due to icon overlapping issue. [Issue#] N/A [Problem] The bookmark toggle icons at the history view are overlapped. [Cause] evas image object has been using so far due to event reponsibility issue. [Solution] replacing the evas image to elm icon [Team] Browser UI [Developer] sangpyo7.kim [Request] N/ Change-Id: Ibeca0457e8e1ec1c22d7e0de11a50a76a469de32 --- .../browser-history-layout.cpp | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/browser-history/browser-history-layout.cpp b/src/browser-history/browser-history-layout.cpp index 9eb3d331..e0b4daa5 100755 --- a/src/browser-history/browser-history-layout.cpp +++ b/src/browser-history/browser-history-layout.cpp @@ -1508,10 +1508,14 @@ void Browser_History_Layout::__bookmark_on_off_icon_clicked_cb(void* data, Evas* int bookmark_id = -1; if (m_data_manager->get_history_db()->is_in_bookmark(item->url.c_str(), &bookmark_id)) { - evas_object_image_file_set(obj, BROWSER_IMAGE_DIR"/I01_icon_bookmark_off.png", NULL); + if (!elm_icon_file_set(obj, BROWSER_IMAGE_DIR"/I01_icon_bookmark_off.png", NULL)) { + BROWSER_LOGE("elm_icon_file_set is failed.\n"); + } m_data_manager->get_bookmark_view()->delete_bookmark_item(bookmark_id); } else { - evas_object_image_file_set(obj, BROWSER_IMAGE_DIR"/I01_icon_bookmark_on.png", NULL); + if (!elm_icon_file_set(obj, BROWSER_IMAGE_DIR"/I01_icon_bookmark_on.png", NULL)) { + BROWSER_LOGE("elm_icon_file_set is failed.\n"); + } m_data_manager->get_bookmark_view()->append_bookmark_item(item->title.c_str(), item->url.c_str()); } } @@ -1542,15 +1546,19 @@ Evas_Object *Browser_History_Layout::__genlist_icon_get_cb(void *data, Evas_Obje return default_favicon; } } else if (!strncmp(part, "elm.icon.2", strlen("elm.icon.2"))) { - Evas_Object *bookmark_icon = evas_object_image_add(evas_object_evas_get(obj)); - evas_object_image_load_size_set(bookmark_icon, 64 * elm_scale_get(), 64 * elm_scale_get()); - evas_object_image_fill_set(bookmark_icon, 0, 0, 64 * elm_scale_get(), 64 * elm_scale_get()); - - if (m_data_manager->get_history_db()->is_in_bookmark(item->url.c_str(), NULL)) - evas_object_image_file_set(bookmark_icon, BROWSER_IMAGE_DIR"/I01_icon_bookmark_on.png", NULL); - else - evas_object_image_file_set(bookmark_icon, BROWSER_IMAGE_DIR"/I01_icon_bookmark_off.png", NULL); - + Evas_Object *bookmark_icon = elm_icon_add(obj); + if (m_data_manager->get_history_db()->is_in_bookmark(item->url.c_str(), NULL)) { + if (!elm_icon_file_set(bookmark_icon, BROWSER_IMAGE_DIR"/I01_icon_bookmark_on.png", NULL)) { + BROWSER_LOGE("elm_icon_file_set is failed.\n"); + return NULL; + } + } else { + if (!elm_icon_file_set(bookmark_icon, BROWSER_IMAGE_DIR"/I01_icon_bookmark_off.png", NULL)) { + BROWSER_LOGE("elm_icon_file_set is failed.\n"); + return NULL; + } + } + evas_object_size_hint_aspect_set(bookmark_icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); evas_object_propagate_events_set(bookmark_icon, EINA_FALSE); evas_object_repeat_events_set(bookmark_icon, EINA_FALSE); -- 2.34.1