Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h
Log Message:
fullscreen/maximuze UNmax/full to the current zone if the zone moved while
max/full.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -3 -r1.592 -r1.593
--- e_border.c 5 Jun 2007 13:58:04 -0000 1.592
+++ e_border.c 10 Jun 2007 04:21:05 -0000 1.593
@@ -1710,15 +1710,16 @@
if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
{
/* Horisontal hasn't been set */
- bd->saved.x = bd->x;
+ bd->saved.x = bd->x - bd->zone->x;
bd->saved.w = bd->w;
}
if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
{
/* Vertical hasn't been set */
- bd->saved.y = bd->y;
+ bd->saved.y = bd->y - bd->zone->y;
bd->saved.h = bd->h;
}
+ bd->saved.zone = bd->zone->num;
e_hints_window_size_set(bd);
e_border_raise(bd);
@@ -1913,21 +1914,21 @@
h = bd->saved.h;
e_border_resize_limit(bd, &w, &h);
e_border_resize_limit(bd, &w, &h);
- e_border_move_resize(bd, bd->x, bd->saved.y, w, h);
+ e_border_move_resize(bd, bd->x, bd->saved.y + bd->zone->y, w, h);
bd->saved.y = bd->saved.h = 0;
e_hints_window_size_set(bd);
}
else if (dir & E_MAXIMIZE_VERTICAL)
{
/* Remove horizontal */
- int w,h;
+ int w, h;
signal = 0;
bd->maximized &= ~E_MAXIMIZE_HORIZONTAL;
w = bd->saved.w;
h = bd->h;
e_border_resize_limit(bd, &w, &h);
- e_border_move_resize(bd, bd->saved.x, bd->y, w, h);
+ e_border_move_resize(bd, bd->saved.x + bd->zone->x, bd->y, w, h);
bd->saved.x = bd->saved.w = 0;
e_hints_window_size_set(bd);
}
@@ -1935,9 +1936,9 @@
{
int x, y, w, h;
/* Maybe some of the sizes has already been set to 0 */
- if (bd->saved.x) x = bd->saved.x;
+ if (bd->saved.x) x = bd->saved.x + bd->zone->x;
else x = bd->x;
- if (bd->saved.y) y = bd->saved.y;
+ if (bd->saved.y) y = bd->saved.y + bd->zone->y;
else y = bd->y;
if (bd->saved.w) w = bd->saved.w;
else w = bd->w;
@@ -1978,10 +1979,11 @@
{
bd->pre_res_change.valid = 0;
- bd->saved.x = bd->x;
- bd->saved.y = bd->y;
+ bd->saved.x = bd->x - bd->zone->x;
+ bd->saved.y = bd->y - bd->zone->y;
bd->saved.w = bd->client.w;
bd->saved.h = bd->client.h;
+ bd->saved.zone = bd->zone->num;
e_hints_window_size_set(bd);
bd->client_inset.l = 0;
@@ -2064,17 +2066,17 @@
bd->fullscreen = 0;
bd->need_fullscreen = 0;
- /* e_zone_fullscreen_set(bd->zone, 0); */
-
if ((screen_size.width != -1) && (screen_size.height != -1))
{
ecore_x_randr_screen_size_set(bd->zone->container->manager->root,
screen_size);
screen_size.width = -1;
screen_size.height = -1;
}
- e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w,
bd->saved.h);
+ e_border_move_resize(bd,
+ bd->saved.x + bd->zone->x,
+ bd->saved.y + bd->zone->y,
+ bd->saved.w, bd->saved.h);
- /* FIXME: Find right layer */
e_border_layer_set(bd, bd->saved.layer);
e_hints_window_fullscreen_set(bd, 0);
@@ -3476,8 +3478,8 @@
{
if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
{
- bd->saved.x = x;
- bd->saved.y = y;
+ bd->saved.x = x - bd->zone->x;
+ bd->saved.y = y - bd->zone->y;
bd->saved.w = w;
bd->saved.h = h;
}
@@ -3488,8 +3490,8 @@
{
if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
{
- bd->saved.x = x;
- bd->saved.y = y;
+ bd->saved.x = x - bd->zone->x;
+ bd->saved.y = y - bd->zone->y;
}
else
e_border_move(bd, x, y);
@@ -3532,8 +3534,8 @@
{
if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
{
- bd->saved.x = x;
- bd->saved.y = y;
+ bd->saved.x = x - bd->zone->x;
+ bd->saved.y = y - bd->zone->y;
}
else
e_border_move(bd, x, y);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- e_border.h 5 Jun 2007 13:58:05 -0000 1.159
+++ e_border.h 10 Jun 2007 04:21:05 -0000 1.160
@@ -391,6 +391,7 @@
struct {
int x, y, w, h;
unsigned int layer;
+ int zone;
} saved;
struct {
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
