mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resistance: check to see if the view is on the output before resisting

Browse source
This commit is contained in:
ARDiDo 2021-11-13 13:47:12 -05:00
parent a54e0fb4b6
commit c107ea7e38
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/resistance.c
View file

@ -34,7 +34,11 @@ void
resistance_move_apply(struct view *view, double *x, double *y) resistance_move_apply(struct view *view, double *x, double *y)
{ {
struct server *server = view->server; struct server *server = view->server;
struct wlr_box mgeom; struct wlr_box mgeom, intersection;
struct wlr_box vgeom = {.x = view->x, .y = view->y, .width = view->w,
.height = view->h};
struct wlr_box tgeom = {.x = *x, .y = *y, .width = view->w,
.height = view->h};
struct output *output; struct output *output;
struct border border = view_border(view); struct border border = view_border(view);
struct edges view_edges; /* The edges of the current view */ struct edges view_edges; /* The edges of the current view */
@ -59,6 +63,12 @@ resistance_move_apply(struct view *view, double *x, double *y)
wl_list_for_each(output, &server->outputs, link) { wl_list_for_each(output, &server->outputs, link) {
mgeom = output_usable_area_in_layout_coords(output); mgeom = output_usable_area_in_layout_coords(output);
if (!wlr_box_intersection(&intersection, &vgeom, &mgeom)
&& !wlr_box_intersection(&intersection, &tgeom,
&mgeom)) {
continue;
}
other_edges.left = mgeom.x; other_edges.left = mgeom.x;
other_edges.top = mgeom.y; other_edges.top = mgeom.y;
other_edges.right = mgeom.x + mgeom.width; other_edges.right = mgeom.x + mgeom.width;
@ -89,7 +99,11 @@ resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo)
{ {
struct server *server = view->server; struct server *server = view->server;
struct output *output; struct output *output;
struct wlr_box mgeom; struct wlr_box mgeom, intersection;
struct wlr_box vgeom = {.x = view->x, .y = view->y, .width = view->w,
.height = view->h};
struct wlr_box tgeom = {.x = new_view_geo->x, .y = new_view_geo->y,
.width = new_view_geo->width, .height = new_view_geo->height};
struct border border = view_border(view); struct border border = view_border(view);
struct edges view_edges; /* The edges of the current view */ struct edges view_edges; /* The edges of the current view */
struct edges target_edges; /* The desired edges */ struct edges target_edges; /* The desired edges */
@ -112,7 +126,15 @@ resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo)
return; return;
} }
wl_list_for_each(output, &server->outputs, link) { wl_list_for_each(output, &server->outputs, link) {
mgeom = output_usable_area_in_layout_coords(output); mgeom = output_usable_area_in_layout_coords(output);
if (!wlr_box_intersection(&intersection, &vgeom, &mgeom)
&& !wlr_box_intersection(&intersection, &tgeom,
&mgeom)) {
continue;
}
other_edges.left = mgeom.x; other_edges.left = mgeom.x;
other_edges.top = mgeom.y; other_edges.top = mgeom.y;
other_edges.right = mgeom.x + mgeom.width; other_edges.right = mgeom.x + mgeom.width;