On Tue, 8 Mar 2011, Enlightenment SVN wrote:
> Log: > fix -> call hide BEFORE del. backport to 1.0 ? Vincent > > > > Author: raster > Date: 2011-03-08 22:16:46 -0800 (Tue, 08 Mar 2011) > New Revision: 57613 > Trac: http://trac.enlightenment.org/e/changeset/57613 > > Modified: > trunk/evas/ChangeLog trunk/evas/src/lib/canvas/evas_object_main.c > > Modified: trunk/evas/ChangeLog > =================================================================== > --- trunk/evas/ChangeLog 2011-03-09 04:59:47 UTC (rev 57612) > +++ trunk/evas/ChangeLog 2011-03-09 06:16:46 UTC (rev 57613) > @@ -146,3 +146,8 @@ > as they have the same base name, but different prototypes > * Add evas_object_ref() and evas_object_unref() to defer > deletion of objects until all references are removed > + > +2011-03-09 Carsten Haitzler (The Rasterman) > + > + * Fix bug with evas_object_del() calling DEL callback BEFORE > + the HIDE one. > > Modified: trunk/evas/src/lib/canvas/evas_object_main.c > =================================================================== > --- trunk/evas/src/lib/canvas/evas_object_main.c 2011-03-09 04:59:47 UTC > (rev 57612) > +++ trunk/evas/src/lib/canvas/evas_object_main.c 2011-03-09 06:16:46 UTC > (rev 57613) > @@ -430,8 +430,16 @@ > evas_common_frameq_flush(); > #endif > > + evas_object_hide(obj); > + if (obj->focused) > + { > + obj->focused = 0; > + obj->layer->evas->focused = NULL; > + _evas_object_event_new(); > + evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL); > + _evas_post_event_callback_call(obj->layer->evas); > + } > _evas_object_event_new(); > - > evas_object_event_callback_call(obj, EVAS_CALLBACK_DEL, NULL); > _evas_post_event_callback_call(obj->layer->evas); > if (obj->name) evas_object_name_set(obj, NULL); > @@ -440,18 +448,9 @@ > evas_object_free(obj, 1); > return; > } > - if (obj->focused) > - { > - obj->focused = 0; > - obj->layer->evas->focused = NULL; > - _evas_object_event_new(); > - evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL); > - _evas_post_event_callback_call(obj->layer->evas); > - } > obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; > obj->mouse_grabbed = 0; > obj->mouse_in = 0; > - evas_object_hide(obj); > evas_object_grabs_cleanup(obj); > while (obj->clip.clipees) > evas_object_clip_unset(obj->clip.clipees->data); > > > ------------------------------------------------------------------------------ > Colocation vs. Managed Hosting > A question and answer guide to determining the best fit > for your organization - today and in the future. > http://p.sf.net/sfu/internap-sfd2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
