nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to fix the off-by-one errors even more.

Browse source
This commit is contained in:
Mikael Magnusson 2008-02-28 12:42:40 +01:00
parent ff0f8dc6a9
commit 2f1dc6da00
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/client.c
View file

@ -4107,7 +4107,7 @@ static void detect_edge(Rect area, ObDirection dir,
if (my_head <= head + 1) if (my_head <= head + 1)
skip_head = TRUE; skip_head = TRUE;
/* check if our window's tail is past the tail of this window */ /* check if our window's tail is past the tail of this window */
if (my_head + my_size - 1 < tail) if (my_head + my_size - 1 <= tail)
skip_tail = TRUE; skip_tail = TRUE;
/* check if the head of this window is closer than the previously /* check if the head of this window is closer than the previously
chosen edge (take into account that the previously chosen chosen edge (take into account that the previously chosen
@ -4126,7 +4126,7 @@ static void detect_edge(Rect area, ObDirection dir,
if (my_head >= head - 1) if (my_head >= head - 1)
skip_head = TRUE; skip_head = TRUE;
/* check if our window's tail is past the tail of this window */ /* check if our window's tail is past the tail of this window */
if (my_head - my_size + 1 > tail) if (my_head - my_size + 1 >= tail)
skip_tail = TRUE; skip_tail = TRUE;
/* check if the head of this window is closer than the previously /* check if the head of this window is closer than the previously
chosen edge (take into account that the previously chosen chosen edge (take into account that the previously chosen
@ -4307,28 +4307,28 @@ void client_find_resize_directional(ObClient *self, ObDirection side,
switch (side) { switch (side) {
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
head = RECT_RIGHT(self->frame->area) + head = RECT_RIGHT(self->frame->area) +
(self->size_inc.width - 1) * (grow ? 1 : -1); (self->size_inc.width - 1) * (grow ? 1 : 0);
e_start = RECT_TOP(self->frame->area); e_start = RECT_TOP(self->frame->area);
e_size = self->frame->area.height; e_size = self->frame->area.height;
dir = grow ? OB_DIRECTION_EAST : OB_DIRECTION_WEST; dir = grow ? OB_DIRECTION_EAST : OB_DIRECTION_WEST;
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
head = RECT_LEFT(self->frame->area) - head = RECT_LEFT(self->frame->area) -
(self->size_inc.width - 1) * (grow ? 1 : -1); (self->size_inc.width - 1) * (grow ? 1 : 0);
e_start = RECT_TOP(self->frame->area); e_start = RECT_TOP(self->frame->area);
e_size = self->frame->area.height; e_size = self->frame->area.height;
dir = grow ? OB_DIRECTION_WEST : OB_DIRECTION_EAST; dir = grow ? OB_DIRECTION_WEST : OB_DIRECTION_EAST;
break; break;
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
head = RECT_TOP(self->frame->area) - head = RECT_TOP(self->frame->area) -
(self->size_inc.height - 1) * (grow ? 1 : -1); (self->size_inc.height - 1) * (grow ? 1 : 0);
e_start = RECT_LEFT(self->frame->area); e_start = RECT_LEFT(self->frame->area);
e_size = self->frame->area.width; e_size = self->frame->area.width;
dir = grow ? OB_DIRECTION_NORTH : OB_DIRECTION_SOUTH; dir = grow ? OB_DIRECTION_NORTH : OB_DIRECTION_SOUTH;
break; break;
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
head = RECT_BOTTOM(self->frame->area) + head = RECT_BOTTOM(self->frame->area) +
(self->size_inc.height - 1) * (grow ? 1 : -1); (self->size_inc.height - 1) * (grow ? 1 : 0);
e_start = RECT_LEFT(self->frame->area); e_start = RECT_LEFT(self->frame->area);
e_size = self->frame->area.width; e_size = self->frame->area.width;
dir = grow ? OB_DIRECTION_SOUTH : OB_DIRECTION_NORTH; dir = grow ? OB_DIRECTION_SOUTH : OB_DIRECTION_NORTH;