diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index b6b34086a..56759fc18 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -429,9 +429,20 @@ group { } rel2 { relative: 1.0 1.0; - offset: -16 0; + offset: -16 -1; } } + description { + state: "hidden" 0.0; + rel1 { + relative: 0 0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + } } part { name: "sb_vbar"; @@ -914,6 +925,7 @@ group { source: "show"; action: STATE_SET "default" 0.0; target: "sb_vbar"; + target: "item"; } program { name: "sb_vbar_hide"; @@ -921,6 +933,7 @@ group { source: "hide"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; + target: "item"; } program { name: "sb_hbar_show"; @@ -928,6 +941,7 @@ group { source: "show"; action: STATE_SET "default" 0.0; target: "sb_hbar"; + target: "item"; } program { name: "sb_hbar_hide"; @@ -935,6 +949,7 @@ group { source: "hide"; action: STATE_SET "hidden" 0.0; target: "sb_hbar"; + target: "item"; } program { diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c index 3b3bcd2d2..66ee1d338 100644 --- a/src/bin/e_fileman_smart.c +++ b/src/bin/e_fileman_smart.c @@ -1735,6 +1735,8 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { E_Fm_Smart_Data *sd; Evas_Event_Mouse_Down *ev; + E_Fm_Icon *icon; + Evas_List *l; E_Menu *mn; E_Menu_Item *mi; int x, y, w, h; @@ -1745,7 +1747,13 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) if(!strcmp(edje_object_part_state_get(sd->edje_obj, "typebuffer", NULL), "shown")) { edje_object_signal_emit(sd->edje_obj, "typebuf_hide", ""); - edje_object_part_text_set(sd->edje_obj, "text", ""); + edje_object_part_text_set(sd->edje_obj, "text", ""); + for (l = sd->files; l; l = l->next) + { + icon = l->data; + e_fm_icon_signal_emit(icon->icon_object, "default", ""); + } + edje_object_signal_emit(sd->edje_obj, "default", ""); } switch (ev->button) @@ -2132,16 +2140,24 @@ _e_fm_icon_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { E_Fm_Icon *icon; Evas_Event_Mouse_Move *ev; + Evas_List *l; - ev = event_info; + ev = event_info; icon = data; - + if(!strcmp(edje_object_part_state_get(icon->sd->edje_obj, "typebuffer", NULL), "shown")) - { + { + E_Fm_Icon *i; edje_object_signal_emit(icon->sd->edje_obj, "typebuf_hide", ""); edje_object_part_text_set(icon->sd->edje_obj, "text", ""); + for (l = icon->sd->files; l; l = l->next) + { + i = l->data; + e_fm_icon_signal_emit(i->icon_object, "default", ""); + } + edje_object_signal_emit(icon->sd->edje_obj, "default", ""); } - + if(icon->sd->win) icon->sd->drag.start = 0; }