styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remember user set bordertype in own variable, and prefer it on border 

change.


SVN revision: 23994
This commit is contained in:
sebastid 2006-07-17 19:04:01 +00:00 committed by sebastid
parent d4aa3c882f
commit 065745cc6e
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_border.c
View File

@ -5202,11 +5202,14 @@ _e_border_eval(E_Border *bd)
}
if (rem->apply & E_REMEMBER_APPLY_BORDER)
{
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
bd->client.border.name = NULL;
if (rem->prop.border)
bd->client.border.name = evas_stringshare_add(rem->prop.border);
bd->client.border.changed = 1;
{
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
bd->client.border.name = NULL;
if (bd->bordername) evas_stringshare_del(bd->bordername);
bd->bordername = evas_stringshare_add(rem->prop.border);
bd->client.border.changed = 1;
}
}
if (rem->apply & E_REMEMBER_APPLY_STICKY)
{
@ -5263,7 +5266,9 @@ _e_border_eval(E_Border *bd)
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");
else if ((bd->client.mwm.borderless) || (bd->borderless))
bd->client.border.name = evas_stringshare_add("borderless");

1
src/bin/e_border.h
View File

@ -341,6 +341,7 @@ struct _E_Border
unsigned int need_maximize : 1;
E_Maximize maximized;
unsigned int borderless : 1;
const char *bordername;
unsigned int lock_user_location : 1; /*DONE*/
unsigned int lock_client_location : 1; /*DONE*/

4
src/bin/e_int_border_border.c
View File

@ -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->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->changed = 1;
}