Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
when maximized - punt of configure reqa to the saved pos.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -3 -r1.542 -r1.543
--- e_border.c 14 Sep 2006 23:16:46 -0000 1.542
+++ e_border.c 16 Sep 2006 05:38:09 -0000 1.543
@@ -3408,14 +3408,14 @@
{
int x, y;
- y = bd->y;
x = bd->x;
+ y = bd->y;
#if 0
- printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i\n",
+ printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i -> %i,%i\n",
bd->client.win,
e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X,
e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y,
- x, y);
+ x, y, e->x, e->y);
#endif
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
x = e->x;
@@ -3440,9 +3440,27 @@
e->w, e->h);
#endif
if ((!bd->lock_client_location) && (!bd->lock_client_size))
- e_border_move_resize(bd, x, y, w, h);
+ {
+ if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
+ {
+ bd->saved.x = x;
+ bd->saved.y = y;
+ bd->saved.w = w;
+ bd->saved.h = h;
+ }
+ else
+ e_border_move_resize(bd, x, y, w, h);
+ }
else if (!bd->lock_client_location)
- e_border_move(bd, x, y);
+ {
+ if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
+ {
+ bd->saved.x = x;
+ bd->saved.y = y;
+ }
+ else
+ e_border_move(bd, x, y);
+ }
else if (!bd->lock_client_size)
{
if ((bd->shaded) || (bd->shading))
@@ -3464,13 +3482,29 @@
}
}
else
- e_border_resize(bd, w, h);
+ {
+ if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
+ {
+ bd->saved.w = w;
+ bd->saved.h = h;
+ }
+ else
+ e_border_resize(bd, w, h);
+ }
}
}
else
{
if (!bd->lock_client_location)
- e_border_move(bd, x, y);
+ {
+ if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
+ {
+ bd->saved.x = x;
+ bd->saved.y = y;
+ }
+ else
+ e_border_move(bd, x, y);
+ }
}
}
else if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
@@ -3512,7 +3546,15 @@
}
}
else
- e_border_resize(bd, w, h);
+ {
+ if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
+ {
+ bd->saved.w = w;
+ bd->saved.h = h;
+ }
+ else
+ e_border_resize(bd, w, h);
+ }
}
}
if (!bd->lock_client_stacking)
-------------------------------------------------------------------------
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
