completely block border changes on MWM borderless windows

ref T1963

seriously.
This commit is contained in:
Mike Blumenkrantz 2015-01-03 00:07:48 -05:00
parent 5bf04eed8f
commit 9ff9de799a
2 changed files with 7 additions and 2 deletions

View File

@ -4096,6 +4096,11 @@ e_client_border_set(E_Client *ec, const char *name)
CRI("CALLING WHEN border.changed SET!");
if (!e_util_strcmp(ec->border.name, name)) return EINA_TRUE;
if (ec->mwm.borderless && name && strcmp(name, "borderless"))
{
e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!"));
CRI("border change attempted for MWM borderless client!");
}
pborder = ec->border.name;
ec->border.name = eina_stringshare_add(name);
if (e_comp_object_frame_theme_set(ec->frame, name))

View File

@ -196,7 +196,7 @@ e_int_client_menu_create(E_Client *ec)
"e/widgets/border/default/shade");
}
if ((!ec->fullscreen) && (!ec->lock_border) && (!ec->shading) && (!ec->shaded))
if ((!ec->fullscreen) && (!ec->lock_border) && (!ec->shading) && (!ec->shaded) && (!ec->mwm.borderless))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Borderless"));
@ -759,7 +759,7 @@ _e_client_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
"e/widgets/border/default/skip"),
"e/widgets/border/default/skip");
if (!ec->lock_border)
if ((!ec->lock_border) && (!ec->mwm.borderless))
{
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("Border"));