From 231a81e812bac442ab63cbd2bc6f65b49089376e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 30 Jul 2014 18:21:31 -0400 Subject: [PATCH] move unredirect client option to submenu --- src/bin/e_int_client_menu.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index 6b218a987..1071e1da4 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -201,13 +201,23 @@ e_int_client_menu_create(E_Client *ec) "e/widgets/border/default/borderless"); } - if (e_comp_config_get()->enable_advanced_features && (e_pixmap_type_get(ec->pixmap) == E_PIXMAP_TYPE_X)) + if (e_comp_config_get()->enable_advanced_features) { + E_Menu *subm; mi = e_menu_item_new(m); - e_menu_item_check_set(mi, 1); - e_menu_item_label_set(mi, _("Unredirected")); - e_menu_item_toggle_set(mi, !ec->redirected); - e_menu_item_callback_set(mi, _e_client_menu_cb_redirect_set, ec); + e_menu_item_label_set(mi, _("Composite")); + e_util_menu_item_theme_icon_set(mi, "preferences-composite"); + subm = e_menu_new(); + e_menu_item_submenu_set(mi, subm); + e_object_data_set(E_OBJECT(subm), ec->comp); + if (e_pixmap_type_get(ec->pixmap) == E_PIXMAP_TYPE_X) + { + mi = e_menu_item_new(subm); + e_menu_item_check_set(mi, 1); + e_menu_item_label_set(mi, _("Unredirected")); + e_menu_item_toggle_set(mi, !ec->redirected); + e_menu_item_callback_set(mi, _e_client_menu_cb_redirect_set, ec); + } } if (!ec->lock_close)