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

Rubber band works with control now. 

SVN revision: 17432
This commit is contained in:
codewarrior 2005-10-11 13:23:54 +00:00 committed by codewarrior
parent 1b173acce8
commit 9f0cb822d8
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/bin/e_fileman_smart.c
View File

@ -11,10 +11,14 @@
* - when we drop something onto an efm from an efm we might not be releasing * - when we drop something onto an efm from an efm we might not be releasing
* the mouse grab. (also onto the e17 desktop, or anything that doesnt * the mouse grab. (also onto the e17 desktop, or anything that doesnt
* accept the drop * accept the drop
*
* - scrolling
* *
* - checking wether events belong to us (ecore events) * - checking wether events belong to us (ecore events)
* *
* - scrolling * - when we select multiple items, the right click menu on the icons needs
* to display some group related things and its actions need to work
* on the group.
* *
* - we need a redraw function that will just re-arrange and not do * - we need a redraw function that will just re-arrange and not do
* the whole thing. for example, when we resize, we should just * the whole thing. for example, when we resize, we should just
@ -31,8 +35,6 @@
* *
* - keyboard shortcuts for directory and file navigation. * - keyboard shortcuts for directory and file navigation.
* *
* - multi select
*
* - allow for icon movement inside the canvas * - allow for icon movement inside the canvas
* *
* - add metadata system which allows us to save icon positions and will * - add metadata system which allows us to save icon positions and will
@ -162,14 +164,15 @@ struct _E_Fileman_Smart_Data
} max; } max;
struct { struct {
Evas_List *files; Evas_List *files;
E_Fileman_File *current_file; E_Fileman_File *current_file;
struct { struct {
unsigned char enabled : 1; unsigned char enabled : 1;
Evas_Coord x, y; Evas_Coord x, y;
Evas_Object *obj; Evas_Object *obj;
} band; Evas_List *files;
} band;
} selection; } selection;
}; };
@ -981,6 +984,7 @@ _e_fm_selections_clear(E_Fileman_Smart_Data *sd)
} }
sd->selection.files = evas_list_free(sd->selection.files); sd->selection.files = evas_list_free(sd->selection.files);
sd->selection.current_file = NULL; sd->selection.current_file = NULL;
sd->selection.band.files = evas_list_free(sd->selection.band.files);
} }
static void static void
@ -1012,15 +1016,23 @@ _e_fm_selections_add_rect(E_Fileman_Smart_Data *sd, Evas_Coord x, Evas_Coord y,
evas_object_geometry_get(file->icon, &xx, &yy, &ww, &hh); evas_object_geometry_get(file->icon, &xx, &yy, &ww, &hh);
if (E_INTERSECTS(x, y, w, h, xx, yy, ww, hh)) if (E_INTERSECTS(x, y, w, h, xx, yy, ww, hh))
{ {
if (!file->state.selected) if(!evas_list_find(file->sd->selection.band.files, file))
{ {
_e_fm_selections_add(file); if(file->state.selected)
} _e_fm_selections_del(file);
} else
else _e_fm_selections_add(file);
{ file->sd->selection.band.files = evas_list_append(file->sd->selection.band.files, file);
if (file->state.selected) // todo: add control+rubberband }
_e_fm_selections_del(file); } else {
if(evas_list_find(file->sd->selection.band.files, file))
{
if(file->state.selected)
_e_fm_selections_del(file);
else
_e_fm_selections_add(file);
file->sd->selection.band.files = evas_list_remove(file->sd->selection.band.files, file);
}
} }
} }
} }
@ -1873,6 +1885,7 @@ _e_fm_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
sd->selection.band.enabled = 0; sd->selection.band.enabled = 0;
evas_object_resize(sd->selection.band.obj, 1, 1); evas_object_resize(sd->selection.band.obj, 1, 1);
evas_object_hide(sd->selection.band.obj); evas_object_hide(sd->selection.band.obj);
sd->selection.band.files = evas_list_free(sd->selection.band.files);
} }
} }
@ -1957,26 +1970,22 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
switch (ev->button) switch (ev->button)
{ {
case 1: case 1:
if (evas_key_modifier_is_set(evas_key_modifier_get(sd->evas), "Control"))
{ if (!evas_key_modifier_is_set(evas_key_modifier_get(sd->evas), "Control"))
_e_fm_selections_clear(sd);
}
else sd->selection.band.enabled = 1;
{ evas_object_move(sd->selection.band.obj, ev->canvas.x, ev->canvas.y);
_e_fm_selections_clear(sd); evas_object_resize(sd->selection.band.obj, 1, 1);
sd->selection.band.enabled = 1; evas_object_show(sd->selection.band.obj);
evas_object_move(sd->selection.band.obj, ev->canvas.x, ev->canvas.y); sd->selection.band.x = ev->canvas.x;
evas_object_resize(sd->selection.band.obj, 1, 1); sd->selection.band.y = ev->canvas.y;
evas_object_show(sd->selection.band.obj); break;
sd->selection.band.x = ev->canvas.x;
sd->selection.band.y = ev->canvas.y;
}
break;
case 3: case 3:
if (!sd->win) break; if (!sd->win) break;
mn = e_menu_new(); mn = e_menu_new();
sd->menu = mn; sd->menu = mn;