Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_int_border_border.c
Log Message:
Remember user set bordertype in own variable, and prefer it on border
change.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -3 -r1.512 -r1.513
--- e_border.c 17 Jul 2006 18:46:05 -0000 1.512
+++ e_border.c 17 Jul 2006 19:04:01 -0000 1.513
@@ -5202,11 +5202,14 @@
}
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 @@
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");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- e_border.h 17 Jul 2006 18:46:05 -0000 1.145
+++ e_border.h 17 Jul 2006 19:04:01 -0000 1.146
@@ -341,6 +341,7 @@
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*/
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_border.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_border_border.c 30 Apr 2006 09:31:31 -0000 1.12
+++ e_int_border_border.c 17 Jul 2006 19:04:01 -0000 1.13
@@ -116,7 +116,9 @@
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;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
