forked from enlightenment/enlightenment
Don't de-select icons unless they are removed from the view.
(Also fixes case if you remove a file behind E's back.) Free items on icon deletion. Kevin Brosius <cobra@compuserve.com> SVN revision: 5754
This commit is contained in:
parent
23ac2be6cf
commit
c300cb9506
18
src/icons.c
18
src/icons.c
|
@ -399,6 +399,18 @@ e_icon_cleanup(E_Icon *ic)
|
|||
D_ENTER;
|
||||
|
||||
/* FIXME: free stuff here! this leaks ... */
|
||||
/* (think I got them all) */
|
||||
|
||||
if (ic->obj.event1)
|
||||
{
|
||||
evas_del_object(ic->view->evas, ic->obj.event1);
|
||||
evas_del_object(ic->view->evas, ic->obj.event2);
|
||||
}
|
||||
|
||||
if (ic->obj.sel.under.icon) ebits_free(ic->obj.sel.under.icon);
|
||||
if (ic->obj.sel.under.text) ebits_free(ic->obj.sel.under.text);
|
||||
if (ic->obj.sel.over.icon) ebits_free(ic->obj.sel.over.icon);
|
||||
if (ic->obj.sel.over.text) ebits_free(ic->obj.sel.over.text);
|
||||
|
||||
e_object_cleanup(E_OBJECT(ic));
|
||||
|
||||
|
@ -490,6 +502,12 @@ e_icon_hide(E_Icon *ic)
|
|||
evas_hide(ic->view->evas, ic->obj.event1);
|
||||
evas_hide(ic->view->evas, ic->obj.event2);
|
||||
|
||||
/* Hide any selection in the view */
|
||||
if(ic->obj.sel.under.icon) ebits_hide(ic->obj.sel.under.icon);
|
||||
if(ic->obj.sel.under.text) ebits_hide(ic->obj.sel.under.text);
|
||||
if(ic->obj.sel.over.icon) ebits_hide(ic->obj.sel.over.icon);
|
||||
if(ic->obj.sel.over.text) ebits_hide(ic->obj.sel.over.text);
|
||||
|
||||
D_RETURN;
|
||||
}
|
||||
|
||||
|
|
|
@ -2796,6 +2796,7 @@ e_dnd_drop_request(Ecore_Event * ev)
|
|||
static void
|
||||
e_dnd_drop_request_free(void)
|
||||
{
|
||||
D_ENTER;
|
||||
|
||||
if (dnd_files)
|
||||
{
|
||||
|
@ -2808,6 +2809,7 @@ e_dnd_drop_request_free(void)
|
|||
|
||||
dnd_num_files = 0;
|
||||
}
|
||||
D_RETURN;
|
||||
}
|
||||
|
||||
|
||||
|
@ -2821,7 +2823,6 @@ e_dnd_handle_drop( E_View *v, E_dnd_enum dnd_pending_mode )
|
|||
|
||||
D_ENTER;
|
||||
|
||||
e_view_deselect_all();
|
||||
/* Need hostname for URL (file://hostname/...) */
|
||||
if(gethostname( hostname, PATH_MAX))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue