forked from enlightenment/enlightenment
Remember user set bordertype in own variable, and prefer it on border
change. SVN revision: 23994
This commit is contained in:
parent
d4aa3c882f
commit
065745cc6e
|
@ -5201,13 +5201,16 @@ _e_border_eval(E_Border *bd)
|
||||||
e_container_border_raise(bd);
|
e_container_border_raise(bd);
|
||||||
}
|
}
|
||||||
if (rem->apply & E_REMEMBER_APPLY_BORDER)
|
if (rem->apply & E_REMEMBER_APPLY_BORDER)
|
||||||
|
{
|
||||||
|
if (rem->prop.border)
|
||||||
{
|
{
|
||||||
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
|
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
|
||||||
bd->client.border.name = NULL;
|
bd->client.border.name = NULL;
|
||||||
if (rem->prop.border)
|
if (bd->bordername) evas_stringshare_del(bd->bordername);
|
||||||
bd->client.border.name = evas_stringshare_add(rem->prop.border);
|
bd->bordername = evas_stringshare_add(rem->prop.border);
|
||||||
bd->client.border.changed = 1;
|
bd->client.border.changed = 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (rem->apply & E_REMEMBER_APPLY_STICKY)
|
if (rem->apply & E_REMEMBER_APPLY_STICKY)
|
||||||
{
|
{
|
||||||
if (rem->prop.sticky) e_border_stick(bd);
|
if (rem->prop.sticky) e_border_stick(bd);
|
||||||
|
@ -5263,7 +5266,9 @@ _e_border_eval(E_Border *bd)
|
||||||
|
|
||||||
if (!bd->client.border.name)
|
if (!bd->client.border.name)
|
||||||
{
|
{
|
||||||
if (bd->fullscreen)
|
if (bd->bordername)
|
||||||
|
bd->client.border.name = evas_stringshare_add(bd->bordername);
|
||||||
|
else if (bd->fullscreen)
|
||||||
bd->client.border.name = evas_stringshare_add("borderless");
|
bd->client.border.name = evas_stringshare_add("borderless");
|
||||||
else if ((bd->client.mwm.borderless) || (bd->borderless))
|
else if ((bd->client.mwm.borderless) || (bd->borderless))
|
||||||
bd->client.border.name = evas_stringshare_add("borderless");
|
bd->client.border.name = evas_stringshare_add("borderless");
|
||||||
|
|
|
@ -341,6 +341,7 @@ struct _E_Border
|
||||||
unsigned int need_maximize : 1;
|
unsigned int need_maximize : 1;
|
||||||
E_Maximize maximized;
|
E_Maximize maximized;
|
||||||
unsigned int borderless : 1;
|
unsigned int borderless : 1;
|
||||||
|
const char *bordername;
|
||||||
|
|
||||||
unsigned int lock_user_location : 1; /*DONE*/
|
unsigned int lock_user_location : 1; /*DONE*/
|
||||||
unsigned int lock_client_location : 1; /*DONE*/
|
unsigned int lock_client_location : 1; /*DONE*/
|
||||||
|
|
|
@ -116,7 +116,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
if ((!cfdata->border->lock_border) && (!cfdata->border->shaded))
|
if ((!cfdata->border->lock_border) && (!cfdata->border->shaded))
|
||||||
{
|
{
|
||||||
if (cfdata->border->client.border.name) evas_stringshare_del(cfdata->border->client.border.name);
|
if (cfdata->border->client.border.name) evas_stringshare_del(cfdata->border->client.border.name);
|
||||||
cfdata->border->client.border.name = evas_stringshare_add(cfdata->bordername);
|
cfdata->border->client.border.name = NULL;
|
||||||
|
if (cfdata->border->bordername) evas_stringshare_del(cfdata->border->bordername);
|
||||||
|
cfdata->border->bordername = evas_stringshare_add(cfdata->bordername);
|
||||||
cfdata->border->client.border.changed = 1;
|
cfdata->border->client.border.changed = 1;
|
||||||
cfdata->border->changed = 1;
|
cfdata->border->changed = 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue