Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
actually cvs was just missing a little work i had done locally - as it was
unused/harmless/did nothing i left it alone for now
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_fm.c 21 Sep 2006 19:57:34 -0000 1.73
+++ e_fm.c 21 Sep 2006 22:26:08 -0000 1.74
@@ -2349,7 +2349,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_between_show(Evas_Object *obj, int after)
+_e_fm2_dnd_drop_between_show(E_Fm2_Icon *ic, int after)
{
}
@@ -2405,13 +2405,13 @@
/* if in middle 50% then put in dir */
if (ev->y <= (ic->y + (ic->h / 4)))
{
- _e_fm2_dnd_drop_into_hide(ic);
- _e_fm2_dnd_drop_between_show(sd->obj, 0);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ _e_fm2_dnd_drop_between_show(ic, 0);
}
else if (ev->y > (ic->y + ((ic->h * 3) / 4)))
{
- _e_fm2_dnd_drop_into_hide(ic);
- _e_fm2_dnd_drop_between_show(sd->obj, 1);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ _e_fm2_dnd_drop_between_show(ic, 1);
}
else
{
@@ -2424,13 +2424,13 @@
/* if top 50% or bottom 50% then insert between
prev or next */
if (ev->y <= (ic->y + (ic->h / 2)))
{
- _e_fm2_dnd_drop_into_hide(ic);
- _e_fm2_dnd_drop_between_show(sd->obj, 0);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ _e_fm2_dnd_drop_between_show(ic, 0);
}
else
{
- _e_fm2_dnd_drop_into_hide(ic);
- _e_fm2_dnd_drop_between_show(sd->obj, 1);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ _e_fm2_dnd_drop_between_show(ic, 1);
}
}
}
@@ -2457,6 +2457,40 @@
return;
}
}
+ /* FIXME: not over icon - is it within the fm view? if so drop there */
+ if (E_INSIDE(ev->x, ev->y, 0, 0, sd->w, sd->h))
+ {
+ /* if listview - it is now after last file */
+ if (sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
+ {
+ ic = evas_list_data(evas_list_last(sd->icons));
+ if (ic)
+ {
+ if (!ic->drag.dnd)
+ {
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ _e_fm2_dnd_drop_between_show(ic, 1);
+ }
+ else
+ {
+ _e_fm2_dnd_drop_between_hide(sd->obj);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ }
+ }
+ else
+ {
+ /* no icons in dir - drop it in */
+ _e_fm2_dnd_drop_between_hide(sd->obj);
+ _e_fm2_dnd_drop_into_hide(sd->obj);
+ }
+ }
+ else
+ {
+ /* if iconview - drop here */
+ }
+ return;
+ }
+ /* outside fm view */
_e_fm2_dnd_drop_between_hide(sd->obj);
_e_fm2_dnd_drop_into_hide(sd->obj);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
