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

- fix restart bug 

- disable monitor, it was causing the bug, need to look into it


SVN revision: 17736
This commit is contained in:
codewarrior 2005-10-21 12:24:57 +00:00 committed by codewarrior
parent 718a3eaafc
commit 2d339df420
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_fileman.c
View File

@ -135,8 +135,7 @@ _e_fileman_free(E_Fileman *fileman)
evas_object_del(fileman->smart); evas_object_del(fileman->smart);
evas_object_del(fileman->main); evas_object_del(fileman->main);
e_object_del(E_OBJECT(fileman->win)); e_object_del(E_OBJECT(fileman->win));
return; free(fileman);
//free(fileman);
} }
static void static void
@ -176,9 +175,8 @@ _e_fileman_delete_cb(E_Win *win)
E_Fileman *fileman; E_Fileman *fileman;
fileman = win->data; fileman = win->data;
D(("e_fileman_delete_cb: (%p)\n", fileman)); D(("e_fileman_delete_cb: (%p)\n", fileman));
e_object_del(E_OBJECT(fileman)); e_object_del(E_OBJECT(fileman));
e_object_del(E_OBJECT(win));
} }
static void static void

42
src/bin/e_fileman_smart.c
View File

@ -555,7 +555,7 @@ _e_fm_smart_del(Evas_Object *object)
e_config_domain_save("efm", sd->conf.main_edd, sd->conf.main); e_config_domain_save("efm", sd->conf.main_edd, sd->conf.main);
if (sd->monitor) ecore_file_monitor_del(sd->monitor); // if (sd->monitor) ecore_file_monitor_del(sd->monitor);
sd->monitor = NULL; sd->monitor = NULL;
while (sd->files) while (sd->files)
@ -1302,8 +1302,8 @@ _e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir)
/* Get new files */ /* Get new files */
sd->files = _e_fm_dir_files_get(sd, E_FM_FILE_TYPE_NORMAL); sd->files = _e_fm_dir_files_get(sd, E_FM_FILE_TYPE_NORMAL);
if (sd->monitor) ecore_file_monitor_del(sd->monitor); // if (sd->monitor) ecore_file_monitor_del(sd->monitor);
sd->monitor = ecore_file_monitor_add(sd->dir, _e_fm_dir_monitor_cb, sd); // sd->monitor = ecore_file_monitor_add(sd->dir, _e_fm_dir_monitor_cb, sd);
/* Get special prev dir */ /* Get special prev dir */
if (strcmp(sd->dir, "/")) if (strcmp(sd->dir, "/"))
{ {
@ -1850,12 +1850,11 @@ _e_fm_icon_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
} }
else else
{ {
#if 0
icon->sd->drag.start = 1; icon->sd->drag.start = 1;
icon->sd->drag.y = -1; icon->sd->drag.y = -1;
icon->sd->drag.x = -1; icon->sd->drag.x = -1;
icon->sd->drag.icon_object = icon; icon->sd->drag.icon_object = icon;
#endif
if (!icon->state.selected) if (!icon->state.selected)
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(icon->sd->evas), "Control")) if (evas_key_modifier_is_set(evas_key_modifier_get(icon->sd->evas), "Control"))
@ -2000,17 +1999,17 @@ static int
_e_fm_win_mouse_move_cb(void *data, int type, void *event) _e_fm_win_mouse_move_cb(void *data, int type, void *event)
{ {
E_Fm_Smart_Data *sd; E_Fm_Smart_Data *sd;
E_Fm_File *file; E_Fm_Icon *icon;
Ecore_X_Event_Mouse_Move *ev; Ecore_X_Event_Mouse_Move *ev;
ev = event; ev = event;
sd = data; sd = data;
/* TODO */ /* TODO - rethink this code */
/*
file = sd->drag.file;
if (!file) return 1; icon = sd->drag.icon_object;
if (!icon) return 1;
if (sd->drag.start) if (sd->drag.start)
{ {
@ -2036,15 +2035,21 @@ _e_fm_win_mouse_move_cb(void *data, int type, void *event)
const char *path = NULL, *part = NULL; const char *path = NULL, *part = NULL;
const char *drop_types[] = { "text/uri-list" }; const char *drop_types[] = { "text/uri-list" };
snprintf(data, sizeof(data), "file://%s/%s", sd->dir, file->attr->name); snprintf(data, sizeof(data), "file://%s", icon->file->path);
ecore_evas_geometry_get(sd->win->ecore_evas, &cx, &cy, NULL, NULL); ecore_evas_geometry_get(sd->win->ecore_evas, &cx, &cy, NULL, NULL);
evas_object_geometry_get(file->icon_img, &x, &y, &w, &h); evas_object_geometry_get(icon->icon_object, &x, &y, &w, &h);
drag = e_drag_new(sd->win->container, cx + x, cy + y, drag = e_drag_new(sd->win->container, cx + x, cy + y,
drop_types, 1, strdup(data), strlen(data), drop_types, 1, strdup(data), strlen(data),
_e_fm_drop_cb); _e_fm_drop_done_cb);
edje_object_file_get(file->icon_img, &path, &part); o = e_fm_icon_add(drag->evas);
e_fm_icon_file_set(o, icon->file);
e_fm_icon_title_set(o, "");
evas_object_resize(o, w, h);
/* This shouldnt be needed anymore
edje_object_file_get(icon->icon_object, &path, &part);
if ((path) && (part)) if ((path) && (part))
{ {
o = edje_object_add(drag->evas); o = edje_object_add(drag->evas);
@ -2055,13 +2060,14 @@ _e_fm_win_mouse_move_cb(void *data, int type, void *event)
int iw, ih; int iw, ih;
o = evas_object_image_add(drag->evas); o = evas_object_image_add(drag->evas);
evas_object_image_size_get(file->icon_img, &iw, &ih); evas_object_image_size_get(icon->icon_object, &iw, &ih);
evas_object_image_size_set(o, iw, ih); evas_object_image_size_set(o, iw, ih);
evas_object_image_data_copy_set(o, evas_object_image_data_get(file->icon_img, 0)); evas_object_image_data_copy_set(o, evas_object_image_data_get(icon->icon_object, 0));
evas_object_image_data_update_add(o, 0, 0, iw, ih); evas_object_image_data_update_add(o, 0, 0, iw, ih);
evas_object_image_fill_set(o, 0, 0, iw, ih); evas_object_image_fill_set(o, 0, 0, iw, ih);
evas_object_resize(o, iw, ih); evas_object_resize(o, iw, ih);
} }
*/
if (!o) if (!o)
{ {
// FIXME: fallback icon for drag // FIXME: fallback icon for drag
@ -2077,7 +2083,7 @@ _e_fm_win_mouse_move_cb(void *data, int type, void *event)
} }
} }
} }
*/
return 1; return 1;
} }