From 3f1987220d47a2b2b85a47771d721e006f989052 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E2=80=9Cvijay=2Etiwari=E2=80=9D?= Date: Tue, 20 Dec 2016 14:12:47 +0530 Subject: [PATCH] [W-Taskmanager] TSAM-11644 Close icon display wrong Change-Id: I2ba9158203b32eae188dda16ecfd16763a1b6fde --- res/edje/item.edc | 42 +++++++++++++++++++++++++++++++++++------- src/scroller.c | 20 +++++++++++++++----- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/res/edje/item.edc b/res/edje/item.edc index 90e5851..21702a5 100644 --- a/res/edje/item.edc +++ b/res/edje/item.edc @@ -19,11 +19,6 @@ collections { #define WIN_W 360 #define WIN_H 360 -//#define WIDGET_WIDTH 360 -//#define WIDGET_HEIGHT 360 - -//#define DEFAULT_FONT "Tizen" -//#define DEFULAT_FONT_CLASS "tizen" base_scale : 1.3; color_classes{ color_class{ @@ -329,6 +324,11 @@ color_classes{ max : 40 40; color : 255 255 255 0; } + description { + state : "hide" 0.0; + inherit : "default" 0.0; + visible: 0; + } } part { name : "img.recent_delete_icon"; @@ -338,7 +338,7 @@ color_classes{ repeat_events : 1; clip_to : "color_clipper"; description{ - state : "default" 0.0s; + state : "default" 0.0; fixed : 1 1; rel1 { relative : (216-63)/216 0; @@ -363,6 +363,11 @@ color_classes{ max : 40 40; color : 255 255 255 0; } + description { + state : "hide" 0.0; + inherit : "default" 0.0; + visible: 0; + } } part{ name : "img.recent_delete_icon_shadow"; @@ -372,7 +377,7 @@ color_classes{ repeat_events : 1; clip_to : "color_clipper"; description{ - state : "default" 0.0s; + state : "default" 0.0; fixed : 1 1; rel1 { relative : (216-63)/216 0 ; @@ -392,6 +397,11 @@ color_classes{ max : 40 40; color : 255 255 255 0; } + description { + state : "hide" 0.0; + inherit : "default" 0.0; + visible: 0; + } } } @@ -509,6 +519,24 @@ color_classes{ target : "txt.app_name"; transition : LINEAR 0.35; } + program { + name : "hide,delete,icon"; + signal : "hide,delete"; + source : "bg"; + action : STATE_SET "hide" 0.0 ; + target : "img.recent_delete_bg"; + target : "img.recent_delete_icon"; + target : "img.recent_delete_icon_shadow"; + } + program { + name : "show,delete,icon"; + signal : "show,delete"; + source : "bg"; + action : STATE_SET "default" 0.0 ; + target : "img.recent_delete_bg"; + target : "img.recent_delete_icon"; + target : "img.recent_delete_icon_shadow"; + } } } } //collections diff --git a/src/scroller.c b/src/scroller.c index f40401f..21bb9b4 100644 --- a/src/scroller.c +++ b/src/scroller.c @@ -558,16 +558,25 @@ static void _box_layout_cb(Evas_Object *o, Evas_Object_Box_Data *priv, void *dat } } -/* -static void _scroller_scroll_cb(void *data, Evas_Object *scroller, void *event_info) +static void _hide_delete_icon(void *data, Evas_Object *scroller, void *event_info) { int page_no = -1; main_h main_info = data; ret_if(!main_info); - elm_scroller_current_page_get(main_info->scrollers, &page_no, NULL); -// Saved.previous_page = page_no; + elm_scroller_current_page_get(main_info->scroller, &page_no, NULL); + Eina_List *list = elm_box_children_get(main_info->box); + Evas_Object *curr_widget = NULL; + Evas_Object *prev_widget = NULL; + if(page_no > 0) + { + prev_widget = eina_list_nth(list, page_no -1); + elm_object_signal_emit(prev_widget, "hide,delete", "bg"); + } + curr_widget = eina_list_nth(list, page_no); + elm_object_signal_emit(curr_widget, "show,delete", "bg"); + eina_list_free(list); } -*/ + Evas_Object *scroller_create(void *data) { @@ -591,6 +600,7 @@ Evas_Object *scroller_create(void *data) evas_object_smart_callback_add(scroller, "scroll,drag,start", _br_scroller_drag_start_cb, main_info); evas_object_smart_callback_add(scroller, "scroll", _br_scroller_scrolled_cb, main_info); evas_object_smart_callback_add(scroller, "scroll,anim,start", _br_scroller_ani_start_cb, NULL); + evas_object_smart_callback_add(scroller, "scroll,page,changed", _hide_delete_icon, main_info); elm_object_style_set(scroller, "effect"); elm_object_part_content_set(main_info->layout, "list", scroller); -- 2.7.4