On Tue, Dec 11, 2012 at 5:33 AM, Enlightenment SVN < no-re...@enlightenment.org> wrote:
> Log: > elementary/naviframe : Remove dummy_edje. Naviframe should be shown with > at least one item, and don't have to care about the state there is no item. > Additionally, it's not a smart member of naviframe, there is no > guarantee when this object will be deleted. > > Oh, really? What about having a naviframe with no items temporarily in your code? I did that because layout's code, the parent class of naviframe, always assumes there's the resize object there for its class functions (go check it yourself). If there is none -> crash. I was being set as smart member via resize_object_set(). Please consider reverting it. Regards, > > Author: woohyun > Date: 2012-12-10 23:33:27 -0800 (Mon, 10 Dec 2012) > New Revision: 80628 > Trac: http://trac.enlightenment.org/e/changeset/80628 > > Modified: > trunk/elementary/ChangeLog trunk/elementary/NEWS > trunk/elementary/src/lib/elc_naviframe.c > > Modified: trunk/elementary/ChangeLog > =================================================================== > --- trunk/elementary/ChangeLog 2012-12-11 03:51:45 UTC (rev 80627) > +++ trunk/elementary/ChangeLog 2012-12-11 07:33:27 UTC (rev 80628) > @@ -802,3 +802,7 @@ > * Make sure private data is not NULL in elm_interface_scrollable. > * Correctly handle failure case in _x11_notify_handler_image. > * Fix missuse of EINA_INLIST_FOREACH in elm_transit.c. > + > +2012-12-11 WooHyun Jung > + > + * Remove dummy object from elm_naviframe. > > Modified: trunk/elementary/NEWS > =================================================================== > --- trunk/elementary/NEWS 2012-12-11 03:51:45 UTC (rev 80627) > +++ trunk/elementary/NEWS 2012-12-11 07:33:27 UTC (rev 80628) > @@ -89,6 +89,7 @@ > * Make sure private data is not NULL in elm_interface_scrollable. > * Correctly handle failure case in _x11_notify_handler_image. > * Don't manipulate dead memory in Eina_Inlist in elm_transit.c. > + * Remove dummy object from elm_naviframe. > > Removals: > > > Modified: trunk/elementary/src/lib/elc_naviframe.c > =================================================================== > --- trunk/elementary/src/lib/elc_naviframe.c 2012-12-11 03:51:45 UTC > (rev 80627) > +++ trunk/elementary/src/lib/elc_naviframe.c 2012-12-11 07:33:27 UTC > (rev 80628) > @@ -466,7 +466,6 @@ > (sd->stack->last->prev, Elm_Naviframe_Item); > > sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(nit)); > - if (!sd->stack) elm_widget_resize_object_set(WIDGET(it), > sd->dummy_edje); > > if (top && !sd->on_deletion) /* must raise another one */ > { > @@ -1244,11 +1243,7 @@ > _elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) > { > Elm_Naviframe_Smart_Data *priv = _pd; > - Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS); > > - priv->dummy_edje = wd->resize_obj = > - edje_object_add(evas_object_evas_get(obj)); > - > eo_do_super(obj, evas_obj_smart_add()); > > priv->auto_pushed = EINA_TRUE; > @@ -1304,8 +1299,6 @@ > > sd->on_deletion = EINA_FALSE; > > - evas_object_del(sd->dummy_edje); > - > eo_do_super(obj, evas_obj_smart_del()); > } > > @@ -1587,7 +1580,6 @@ > (sd->stack->last->prev, Elm_Naviframe_Item); > > sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(it)); > - if (!sd->stack) elm_widget_resize_object_set(obj, sd->dummy_edje); > > if (prev_it) > { > > > > ------------------------------------------------------------------------------ > LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial > Remotely access PCs and mobile devices and provide instant support > Improve your efficiency, and focus on delivering more value-add services > Discover what IT Professionals Know. Rescue delivers > http://p.sf.net/sfu/logmein_12329d2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > -- Gustavo Lima Chaves Senior Developer ProFUSION embedded systems http://profusion.mobi ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
