forked from enlightenment/enlightenment
Actually fix unmaximize left/right
Revert previous commit and set correct values for E_MAXIMIZE_LEFT and E_MAXIMIZE_RIGHT to save x and w values. SVN revision: 76201
This commit is contained in:
parent
c112a36760
commit
adac052c0a
|
@ -2783,10 +2783,7 @@ e_border_maximize(E_Border *bd,
|
||||||
}
|
}
|
||||||
|
|
||||||
bd->pre_res_change.valid = 0;
|
bd->pre_res_change.valid = 0;
|
||||||
if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL) ||
|
if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
|
||||||
(bd->maximized & E_MAXIMIZE_LEFT) ||
|
|
||||||
(bd->maximized & E_MAXIMIZE_RIGHT))
|
|
||||||
|
|
||||||
{
|
{
|
||||||
/* Horizontal hasn't been set */
|
/* Horizontal hasn't been set */
|
||||||
bd->saved.x = bd->x - bd->zone->x;
|
bd->saved.x = bd->x - bd->zone->x;
|
||||||
|
@ -2872,17 +2869,9 @@ e_border_unmaximize(E_Border *bd,
|
||||||
y = bd->saved.y + bd->zone->y;
|
y = bd->saved.y + bd->zone->y;
|
||||||
bd->saved.h = bd->saved.y = 0;
|
bd->saved.h = bd->saved.y = 0;
|
||||||
bd->maximized &= ~E_MAXIMIZE_VERTICAL;
|
bd->maximized &= ~E_MAXIMIZE_VERTICAL;
|
||||||
|
|
||||||
if (max & E_MAXIMIZE_LEFT ||
|
|
||||||
max & E_MAXIMIZE_RIGHT)
|
|
||||||
{
|
|
||||||
w = bd->saved.w;
|
|
||||||
x = bd->saved.x + bd->zone->x;
|
|
||||||
bd->saved.w = bd->saved.x = 0;
|
|
||||||
bd->maximized &= ~E_MAXIMIZE_LEFT;
|
bd->maximized &= ~E_MAXIMIZE_LEFT;
|
||||||
bd->maximized &= ~E_MAXIMIZE_RIGHT;
|
bd->maximized &= ~E_MAXIMIZE_RIGHT;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (max & E_MAXIMIZE_HORIZONTAL)
|
if (max & E_MAXIMIZE_HORIZONTAL)
|
||||||
{
|
{
|
||||||
/* Remove horizontal */
|
/* Remove horizontal */
|
||||||
|
|
|
@ -61,8 +61,8 @@ typedef enum _E_Maximize
|
||||||
E_MAXIMIZE_VERTICAL = 0x00000010,
|
E_MAXIMIZE_VERTICAL = 0x00000010,
|
||||||
E_MAXIMIZE_HORIZONTAL = 0x00000020,
|
E_MAXIMIZE_HORIZONTAL = 0x00000020,
|
||||||
E_MAXIMIZE_BOTH = 0x00000030,
|
E_MAXIMIZE_BOTH = 0x00000030,
|
||||||
E_MAXIMIZE_LEFT = 0x00000050,
|
E_MAXIMIZE_LEFT = 0x00000070,
|
||||||
E_MAXIMIZE_RIGHT = 0x00000090,
|
E_MAXIMIZE_RIGHT = 0x000000b0,
|
||||||
E_MAXIMIZE_DIRECTION = 0x000000f0
|
E_MAXIMIZE_DIRECTION = 0x000000f0
|
||||||
} E_Maximize;
|
} E_Maximize;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue