From f696996503008b7fe0b4d6373e03c76e264dfc43 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 25 Jul 2006 02:37:33 +0000 Subject: [PATCH] Move "Close" away from the bottom of the menu. Placed below "Kill" now. This removes a "Cleanups" item from todo. SVN revision: 24178 --- src/bin/e_int_border_menu.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 1440b2758..9b45da542 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -292,10 +292,22 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ (char *)e_theme_edje_file_get("base/theme/borders", "widgets/border/default/kill"), "widgets/border/default/kill"); - mi = e_menu_item_new(m); - e_menu_item_separator_set(mi, 1); } + if (!bd->lock_close) + { + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Close")); + e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/borders", + "widgets/border/default/close"), + "widgets/border/default/close"); + } + + mi = e_menu_item_new(m); + e_menu_item_separator_set(mi, 1); + /* Only allow to change layer for windows in "normal" layers */ if ((!bd->lock_user_stacking) && (!bd->internal) && @@ -332,17 +344,6 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ "widgets/border/default/minimize"); } - if (!bd->lock_close) - { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Close")); - e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd); - e_menu_item_icon_edje_set(mi, - (char *)e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/close"), - "widgets/border/default/close"); - } - if (key) e_menu_activate_key(m, bd->zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN);