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

Make the edge detection fully include monitor edges.

Browse source 
This fixes the move-to-edge behaviour, when moving past the edge of a monitor,
the window will stop with its tail edge against the inside of the monitor's
edge.
This commit is contained in:
Dana Jansens 2009-12-09 16:00:32 -05:00
parent e0015160f0
commit ade3b4dd69
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
openbox/client.c
View file

@ -4237,38 +4237,25 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
gint *dest, gboolean *near_edge) gint *dest, gboolean *near_edge)
{ {
GList *it; GList *it;
Rect *a, *mon; Rect *a;
Rect dock_area; Rect dock_area;
gint edge; gint edge;
guint i;
a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS,
&self->frame->area); &self->frame->area);
mon = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR,
&self->frame->area);
switch (dir) { switch (dir) {
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
if (my_head >= RECT_TOP(*mon) + 1)
edge = RECT_TOP(*mon) - 1;
else
edge = RECT_TOP(*a) - 1; edge = RECT_TOP(*a) - 1;
break; break;
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
if (my_head <= RECT_BOTTOM(*mon) - 1)
edge = RECT_BOTTOM(*mon) + 1;
else
edge = RECT_BOTTOM(*a) + 1; edge = RECT_BOTTOM(*a) + 1;
break; break;
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
if (my_head <= RECT_RIGHT(*mon) - 1)
edge = RECT_RIGHT(*mon) + 1;
else
edge = RECT_RIGHT(*a) + 1; edge = RECT_RIGHT(*a) + 1;
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
if (my_head >= RECT_LEFT(*mon) + 1)
edge = RECT_LEFT(*mon) - 1;
else
edge = RECT_LEFT(*a) - 1; edge = RECT_LEFT(*a) - 1;
break; break;
default: default:
@ -4278,6 +4265,15 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
*dest = edge; *dest = edge;
*near_edge = TRUE; *near_edge = TRUE;
/* search for edges of monitors */
for (i = 0; i < screen_num_monitors; ++i) {
Rect *area = screen_area(self->desktop, i, NULL);
detect_edge(*area, dir, my_head, my_size, my_edge_start,
my_edge_size, dest, near_edge);
g_free(area);
}
/* search for edges of clients */
for (it = client_list; it; it = g_list_next(it)) { for (it = client_list; it; it = g_list_next(it)) {
ObClient *cur = it->data; ObClient *cur = it->data;
@ -4299,7 +4295,6 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
detect_edge(dock_area, dir, my_head, my_size, my_edge_start, detect_edge(dock_area, dir, my_head, my_size, my_edge_start,
my_edge_size, dest, near_edge); my_edge_size, dest, near_edge);
g_free(a); g_free(a);
g_free(mon);
} }
void client_find_move_directional(ObClient *self, ObDirection dir, void client_find_move_directional(ObClient *self, ObDirection dir,