Move adding the extra separator on menu to the function that is calling the

"menu extend" so that we don't end up with extra separators at the end of
the menu.


SVN revision: 31239
This commit is contained in:
Christopher Michael 2007-08-11 09:24:34 +00:00
parent d2e73bfbc7
commit 8557965fd6
2 changed files with 5 additions and 10 deletions

View File

@ -6214,11 +6214,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
}
if (sd->icon_menu.end.func)
{
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, NULL);
}
sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, NULL);
}
man = e_manager_current_get();
@ -6434,11 +6430,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
if (sd->icon_menu.end.func)
{
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, &(ic->info));
}
sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, &(ic->info));
}
man = e_manager_current_get();

View File

@ -513,6 +513,9 @@ _e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *in
fwin = data;
if (e_fm2_has_parent_get(obj))
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Go to Parent Directory"));
e_menu_item_icon_edje_set(mi,