styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efm no longer shows the drop target animation for targets that are not valid for dropping onto 

SVN revision: 76612
This commit is contained in:
Mike Blumenkrantz 2012-09-13 14:02:28 +00:00
parent 097e570c03
commit cf539e40fd
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/e_fm.c
View File

@ -6107,9 +6107,15 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
e_drop_handler_action_set(ev->action);
EINA_LIST_FOREACH(sd->icons, l, ic)
{
if (E_INSIDE(dx, dy, ic->x - ic->sd->pos.x, ic->y - ic->sd->pos.y, ic->w, ic->h))
{
if (!E_INSIDE(dx, dy, ic->x - ic->sd->pos.x, ic->y - ic->sd->pos.y, ic->w, ic->h)) continue;
if (ic->drag.dnd) continue;
if (!S_ISDIR(ic->info.statinfo.st_mode))
{
if (ic->sd->drop_icon)
_e_fm2_dnd_drop_hide(sd->obj);
_e_fm2_dnd_drop_all_show(sd->obj);
return;
}
/* if list view */
if (_e_fm2_view_mode_get(ic->sd) == E_FM2_VIEW_MODE_LIST)
{
@ -6117,8 +6123,7 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
if (ic->sd->order_file)
{
/* if dir: */
if ((S_ISDIR(ic->info.statinfo.st_mode)) &&
(!ic->sd->config->view.no_subdir_drop))
if (!ic->sd->config->view.no_subdir_drop)
{
/* if bottom 25% or top 25% then insert between prev or next */
/* if in middle 50% then put in dir */
@ -6151,21 +6156,18 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
* if it's over a dir - hilight as it will be dropped info
* FIXME: should there be a separate highlighting function for files?
* */
if (!(S_ISDIR(ic->info.statinfo.st_mode)) ||
(!ic->sd->config->view.no_subdir_drop))
if (!ic->sd->config->view.no_subdir_drop)
_e_fm2_dnd_drop_show(ic, -1);
}
}
else
{
/* if it's over a dir - hilight as it will be dropped in */
if (!(S_ISDIR(ic->info.statinfo.st_mode)) ||
(!ic->sd->config->view.no_subdir_drop))
if (!ic->sd->config->view.no_subdir_drop)
_e_fm2_dnd_drop_show(ic, -1);
}
return;
}
}
/* FIXME: not over icon - is it within the fm view? if so drop there */
if (E_INSIDE(dx, dy, 0, 0, sd->w, sd->h))
{