mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unfolded long fmin/fmax calls

Browse source
This commit is contained in:
Louis Hampton 2020-06-11 13:04:36 +01:00
parent da4366e566
commit 2b77f143d9
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/input/seatop_resize_floating.c
View file

@ -75,16 +75,24 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec,
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(fmax(min_width + border_width, fmin(width, max_width - border_width)), 1); double bounded_width = fmax(min_width + border_width,
height = fmax(fmax(min_height + border_height, fmin(height, max_height - border_height)), 1); fmin(width, max_width - border_width));
double bounded_height = fmax(min_height + border_height,
fmin(height, max_height - border_height));
width = fmax(bounded_width, 1);
height = fmax(bounded_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(fmax(view_min_width + border_width, fmin(width, view_max_width - border_width)), 1); double bounded_view_width = fmax(view_min_width + border_width,
height = fmax(fmax(view_min_height + border_height, fmin(height, view_max_height - border_height)), 1); fmin(width, view_max_width - border_width));
double bounded_view_height = fmax(view_min_height + border_height,
fmin(height, view_max_height - border_height));
width = fmax(bounded_view_width, 1);
height = fmax(bounded_view_height, 1);
} }