summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan <ch.kumar@samsung.com>2016-10-10 19:28:29 +0530
committerChandan <ch.kumar@samsung.com>2016-10-12 12:01:47 +0530
commitfce9ffe0e6cf03e2e7a50a81a3deebaebfe6cb3e (patch)
tree57001e71d61352d9d73a83bc7a7f358c0085f51a
parentaf8c3cbabe91bd67f67f883069c1aed80f05e04c (diff)
downloadattach-panel-document-fce9ffe0e6cf03e2e7a50a81a3deebaebfe6cb3e.tar.gz
attach-panel-document-fce9ffe0e6cf03e2e7a50a81a3deebaebfe6cb3e.tar.bz2
attach-panel-document-fce9ffe0e6cf03e2e7a50a81a3deebaebfe6cb3e.zip
Change-Id: I1a1b74716660329a3f5308a129d733ada30cf747 Signed-off-by: Chandan <ch.kumar@samsung.com>
-rw-r--r--include/doc-list.h2
-rw-r--r--res/edje/attach-panel-document.edc3
-rw-r--r--src/attach-panel-document.c5
-rw-r--r--src/doc-list.c12
4 files changed, 12 insertions, 10 deletions
diff --git a/include/doc-list.h b/include/doc-list.h
index fb4b262..53a2e4c 100644
--- a/include/doc-list.h
+++ b/include/doc-list.h
@@ -100,7 +100,7 @@ enum _FILE_TYPE {
x = NULL;\
} \
} while (0)
-void doc_list_change_selection_mode(doc_ugdata *ugd, bool state);
+void doc_list_change_selection_mode(doc_ugdata *ugd);
int doc_list_lang_update(doc_ugdata *ugd);
int doc_update_genlist(doc_ugdata *ugd);
int doc_create_genlist(doc_ugdata *ugd);
diff --git a/res/edje/attach-panel-document.edc b/res/edje/attach-panel-document.edc
index 032ce4b..77d51c2 100644
--- a/res/edje/attach-panel-document.edc
+++ b/res/edje/attach-panel-document.edc
@@ -38,8 +38,9 @@ collections {
type: "RECT";
description {
state: "default" 0.0;
+ fixed: 1 1;
rel1 { relative: 0.0 0.0;}
- rel2 { relative: 1.0 1.0; offset: -1 -1; }
+ rel2 { relative: 1.0 1.0;}
color: 255 255 255 255;
}
}
diff --git a/src/attach-panel-document.c b/src/attach-panel-document.c
index a5065d2..af3b3fd 100644
--- a/src/attach-panel-document.c
+++ b/src/attach-panel-document.c
@@ -550,7 +550,7 @@ static void _doc_message(ui_gadget_h ug, app_control_h msg, app_control_h servic
ugd->attach_panel_display_mode = ATTACH_PANEL_HALF_MODE;
ugd->file_select_mode = DOC_FILE_SELECT_T_ONE;
ugd->b_multifile = false;
- doc_list_change_selection_mode(ugd, false);
+ doc_list_change_selection_mode(ugd);
ugd->thumbs_d->b_editmode = false;
elm_genlist_realized_items_update(ugd->thumbs_d->genlist);
@@ -570,13 +570,14 @@ static void _doc_message(ui_gadget_h ug, app_control_h msg, app_control_h servic
ugd->thumbs_d->tot_selected = 0;
elm_naviframe_item_title_enabled_set(ugd->nf_it, EINA_FALSE, EINA_FALSE);
+ doc_update_genlist(ugd);
} else if (display_mode && !strcmp(display_mode, "multiple")) {
doc_dbg("multiple_selection");
ugd->attach_panel_display_mode = ATTACH_PANEL_FULL_MODE;
ugd->file_select_mode = DOC_FILE_SELECT_T_MULTIPLE;
ugd->b_multifile = true;
- doc_list_change_selection_mode(ugd, true);
+ doc_list_change_selection_mode(ugd);
ugd->thumbs_d->b_editmode = true;
elm_genlist_realized_items_update(ugd->thumbs_d->genlist);
diff --git a/src/doc-list.c b/src/doc-list.c
index 2fa7732..c017892 100644
--- a/src/doc-list.c
+++ b/src/doc-list.c
@@ -989,16 +989,16 @@ static void _doc_list_navi_cancel_cb(void *data, Evas_Object *obj, void *ei)
elm_naviframe_item_pop(app_data->naviframe);
}
-void doc_list_change_selection_mode(doc_ugdata *ugd, bool state)
+void doc_list_change_selection_mode(doc_ugdata *ugd)
{
DOC_CHECK(ugd);
DOC_CHECK(ugd->thumbs_d);
if (ugd->thumbs_d->genlist) {
- if (ugd->is_attach_panel && (ugd->attach_panel_display_mode != ATTACH_PANEL_FULL_MODE)) {
- elm_scroller_movement_block_set(ugd->thumbs_d->genlist, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
- } else {
- elm_scroller_movement_block_set(ugd->thumbs_d->genlist, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
+ if (ugd->is_attach_panel && (ugd->attach_panel_display_mode == ATTACH_PANEL_HALF_MODE)) {
+ elm_scroller_movement_block_set(ugd->thumbs_d->genlist, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL | ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
+ } else if (ugd->is_attach_panel) {
+ elm_scroller_movement_block_set(ugd->thumbs_d->genlist, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
}
}
}
@@ -1278,7 +1278,7 @@ int doc_create_genlist(doc_ugdata *ugd)
evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
if (ugd->is_attach_panel && (ugd->attach_panel_display_mode != ATTACH_PANEL_FULL_MODE)) {
- elm_scroller_movement_block_set(genlist, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
+ elm_scroller_movement_block_set(genlist, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL | ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
}
if (ugd->is_attach_panel) {