I lied, it's not ticket #1691. On Fri, Nov 2, 2012 at 11:56 AM, Enlightenment SVN < [email protected]> wrote:
> Log: > finally fix annoying submenu offset bug > ticket #1691 > > > Author: discomfitor > Date: 2012-11-02 04:56:32 -0700 (Fri, 02 Nov 2012) > New Revision: 78854 > Trac: http://trac.enlightenment.org/e/changeset/78854 > > Modified: > trunk/e/src/bin/e_menu.c > > Modified: trunk/e/src/bin/e_menu.c > =================================================================== > --- trunk/e/src/bin/e_menu.c 2012-11-02 11:35:24 UTC (rev 78853) > +++ trunk/e/src/bin/e_menu.c 2012-11-02 11:56:32 UTC (rev 78854) > @@ -763,7 +763,17 @@ > _e_menu_lock = EINA_TRUE; > if ((mi->submenu) || (mi->submenu_pre_cb.func)) > { > - if (mi->submenu_object) evas_object_del(mi->submenu_object); > + if (mi->submenu_object) > + { > + if (!e_util_strcmp(evas_object_type_get(mi->submenu_object), > "edje")) > + { > + /* already have a correct submenu object, don't re-set > it */ > + _e_menu_lock = EINA_FALSE; > + if (sub) e_object_unref(E_OBJECT(sub)); > + return; > + } > + evas_object_del(mi->submenu_object); > + } > o = edje_object_add(mi->menu->evas); > if (sub && (mi->submenu != sub)) e_object_ref(E_OBJECT(sub)); > mi->submenu = sub; > @@ -776,6 +786,16 @@ > edje_object_size_min_calc(mi->submenu_object, &ww, &hh); > mi->submenu_w = ww; > mi->submenu_h = hh; > + edje_object_part_swallow(mi->bg_object, "e.swallow.content", > + mi->container_object); > + edje_object_size_min_calc(mi->bg_object, &ww, &hh); > + e_box_pack_options_set(mi->bg_object, > + 1, 1, /* fill */ > + 1, 0, /* expand */ > + 0.5, 0.5, /* align */ > + ww, hh, /* min */ > + -1, -1 /* max */ > + ); > } > else > { > > > > ------------------------------------------------------------------------------ > LogMeIn Central: Instant, anywhere, Remote PC access and management. > Stay in control, update software, and manage PCs from one command center > Diagnose problems and improve visibility into emerging IT issues > Automate, monitor and manage. Do more in less time with Central > http://p.sf.net/sfu/logmein12331_d2d > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
