mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 12:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle border width and height on minimum floating sizes

Browse Source 
This fixes: https://github.com/swaywm/sway/issues/5337

Co-authored-by: Moon Sungjoon <sumoon@seoulsaram.org>
This commit is contained in:
RoastVeg 2020-06-09 16:47:38 +01:00 committed by Simon Ser
parent 0b4e3d39eb
commit f2b6d1ec29
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sway/input/seatop_resize_floating.c
View File

@ -80,17 +80,25 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
double height = e->ref_height + grow_height; double height = e->ref_height + grow_height;
int min_width, max_width, min_height, max_height; int min_width, max_width, min_height, max_height;
floating_calculate_constraints(&min_width, &max_width, floating_calculate_constraints(&min_width, &max_width,
&min_height, &max_height); &min_height, &max_height);
width = fmax(min_width + border_width, fmin(width, max_width)); width = fmin(width, max_width - border_width);
height = fmax(min_height + border_height, fmin(height, max_height)); width = fmax(width, min_width + border_width);
width = fmax(width, 1);
height = fmin(height, max_height - border_height);
height = fmax(height, min_height + border_height);
height = fmax(height, 1);
// Apply the view's min/max size // Apply the view's min/max size
if (con->view) { if (con->view) {
double view_min_width, view_max_width, view_min_height, view_max_height; double view_min_width, view_max_width, view_min_height, view_max_height;
view_get_constraints(con->view, &view_min_width, &view_max_width, view_get_constraints(con->view, &view_min_width, &view_max_width,
&view_min_height, &view_max_height); &view_min_height, &view_max_height);
width = fmax(view_min_width + border_width, fmin(width, view_max_width)); width = fmin(width, view_max_width - border_width);
height = fmax(view_min_height + border_height, fmin(height, view_max_height)); width = fmax(width, view_min_width + border_width);
width = fmax(width, 1);
height = fmin(height, view_max_height - border_height);
height = fmax(height, view_min_height + border_height);
height = fmax(height, 1);
} }