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

cursor: Move resistance_resize_apply() before view_adjust_size()

Browse source 
This ensures that screen edge resistance does not result in sizes
that violate WM_SIZE_HINTS constraints.

Also correct a coding style issue nearby.
This commit is contained in:
John Lindgren 2022-07-17 23:38:11 -04:00 • committed by Johan Malm
parent 06cc21664f
commit 2b7be71254
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cursor.c
View file

@ -150,16 +150,19 @@ process_cursor_resize(struct server *server, uint32_t time)
.x = view->x, .y = view->y, .width = view->w, .height = view->h .x = view->x, .y = view->y, .width = view->w, .height = view->h
}; };
if (server->resize_edges & WLR_EDGE_TOP) if (server->resize_edges & WLR_EDGE_TOP) {
new_view_geo.height = server->grab_box.height - dy; new_view_geo.height = server->grab_box.height - dy;
else if (server->resize_edges & WLR_EDGE_BOTTOM) } else if (server->resize_edges & WLR_EDGE_BOTTOM) {
new_view_geo.height = server->grab_box.height + dy; new_view_geo.height = server->grab_box.height + dy;
}
if (server->resize_edges & WLR_EDGE_LEFT) if (server->resize_edges & WLR_EDGE_LEFT) {
new_view_geo.width = server->grab_box.width - dx; new_view_geo.width = server->grab_box.width - dx;
else if (server->resize_edges & WLR_EDGE_RIGHT) } else if (server->resize_edges & WLR_EDGE_RIGHT) {
new_view_geo.width = server->grab_box.width + dx; new_view_geo.width = server->grab_box.width + dx;
}
resistance_resize_apply(view, &new_view_geo);
view_adjust_size(view, &new_view_geo.width, &new_view_geo.height); view_adjust_size(view, &new_view_geo.width, &new_view_geo.height);
if (server->resize_edges & WLR_EDGE_TOP) { if (server->resize_edges & WLR_EDGE_TOP) {
@ -174,7 +177,6 @@ process_cursor_resize(struct server *server, uint32_t time)
server->grab_box.width - new_view_geo.width; server->grab_box.width - new_view_geo.width;
} }
resistance_resize_apply(view, &new_view_geo);
view_move_resize(view, new_view_geo); view_move_resize(view, new_view_geo);
} }