block border-affecting entries from showing up in client menu with csd

This commit is contained in:
Mike Blumenkrantz 2015-09-24 16:00:10 -04:00
parent a4ebee266d
commit 14283ffefa
1 changed files with 4 additions and 2 deletions

View File

@ -183,6 +183,7 @@ e_int_client_menu_create(E_Client *ec)
}
if ((!ec->lock_user_shade) && (!ec->fullscreen) && (!ec->maximized) &&
e_comp_object_frame_allowed(ec->frame) &&
((!ec->border.name) || (!borderless)))
{
mi = e_menu_item_new(m);
@ -196,7 +197,8 @@ e_int_client_menu_create(E_Client *ec)
"e/widgets/border/default/shade");
}
if ((!ec->fullscreen) && (!ec->lock_border) && (!ec->shading) && (!ec->shaded) && (!ec->mwm.borderless))
if ((!ec->fullscreen) && (!ec->lock_border) && (!ec->shading) &&
(!ec->shaded) && e_comp_object_frame_allowed(ec->frame))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Borderless"));
@ -1506,7 +1508,7 @@ _e_client_menu_cb_border_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi)
e_menu_item_submenu_set(mi, subm);
e_object_unref(E_OBJECT(subm));
if (e_configure_registry_exists("internal/borders_border"))
if (e_comp_object_frame_allowed(ec->frame) && e_configure_registry_exists("internal/borders_border"))
{
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("Select Border Style"));