From 49a1e778f8bfea8f2e8144ec8ac09889213b1d4e Mon Sep 17 00:00:00 2001 From: shubham kumar Date: Mon, 24 Oct 2016 16:40:02 +0530 Subject: [PATCH] [TSAM-9296]search view issue resolved Change-Id: I7ae85cacc4a61e26c552f01f06b36befa62b5725 Signed-off-by: shubham kumar --- res/edje/myfile.edc | 18 ++++++++++++++++++ src/common/mf-callback.c | 10 +++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/res/edje/myfile.edc b/res/edje/myfile.edc index 78aef20..fa04563 100644 --- a/res/edje/myfile.edc +++ b/res/edje/myfile.edc @@ -1555,6 +1555,10 @@ group { name: "popup_text_progressbar_view_layout"; rel1 { relative: 0.0 0.4; to_y:"search_bar";} rel2 { relative: 1.0 1.0;} } + description { state: "back" 0.0; + rel1 { relative: 0.0 1.0; to_y:"search_bar";} + rel2 { relative: 1.0 1.0;} + } } } programs { @@ -1566,12 +1570,26 @@ group { name: "popup_text_progressbar_view_layout"; target: "search_bar"; } program { + name: "show_search"; + source: "search_bar"; + signal: "show"; + action: STATE_SET "default" 0.0; + target: "search_bar"; + } + program { name: "show"; source: "elm.swallow.content"; signal: "show"; action: STATE_SET "hide" 0.0; target: "elm.swallow.content"; } + program { + name: "back_search"; + source: "elm.swallow.content"; + signal: "back"; + action: STATE_SET "back" 0.0; + target: "elm.swallow.content"; + } } } diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c index ccda952..14c39c3 100755 --- a/src/common/mf-callback.c +++ b/src/common/mf-callback.c @@ -132,6 +132,8 @@ void __mf_compress_pipe_cb(void *data, void *buffer, unsigned int nbyte) struct appdata *ap = (struct appdata *)data; char count[1024]; char per[1024]; + int percentage = 0; + int finished_count = 0; mf_compress_pipe_msg *pSearchMsg = (mf_compress_pipe_msg *) buffer; if (pSearchMsg == NULL) { @@ -148,11 +150,11 @@ void __mf_compress_pipe_cb(void *data, void *buffer, unsigned int nbyte) } else if (pSearchMsg->mf_sp_msg_type == MF_SEARCH_PIPE_MSG_RESULT_REPORT) { - int finished_count = (pSearchMsg->finished_count-1); + finished_count = (pSearchMsg->finished_count-1); if (finished_count < 0) { finished_count = 0; } - int percentage = ((finished_count * 100 )/pSearchMsg->total_count); + percentage = ((finished_count * 100 )/pSearchMsg->total_count); snprintf(count, sizeof(count), "%d/%d", finished_count, pSearchMsg->total_count); snprintf(per, sizeof(per), "%d %%", percentage); elm_progressbar_value_set(ap->mf_FileOperation.progress_bar, (double)((double)percentage/100)); @@ -713,7 +715,9 @@ void mf_callback_cancel_cb(void *data, Evas_Object *obj, void *event_info) /*1 pop edit view */ if (ap->mf_Status.extra == MORE_SEARCH) { ap->mf_Status.more = MORE_SEARCH; - mf_search_view_create(ap); + elm_object_signal_emit(ap->mf_MainWindow.pNaviLayout, "show", "search_bar"); + elm_object_signal_emit(ap->mf_MainWindow.pNaviLayout, "back", "elm.swallow.content"); + //mf_search_view_create(ap); } else { ap->mf_Status.more = MORE_DEFAULT; SAFE_FREE_CHAR(ap->mf_Status.entry_path); -- 2.7.4