mirror of
https://github.com/swaywm/sway.git
synced 2026-04-26 06:46:26 -04:00
Handle border width and height on minimum floating sizes
This commit is contained in:
parent
ed08f2f20c
commit
da4366e566
1 changed files with 4 additions and 4 deletions
|
|
@ -75,16 +75,16 @@ 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(min_width + border_width, fmin(width, max_width));
|
width = fmax(fmax(min_width + border_width, fmin(width, max_width - border_width)), 1);
|
||||||
height = fmax(min_height + border_height, fmin(height, max_height));
|
height = fmax(fmax(min_height + border_height, fmin(height, max_height - border_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 = fmax(fmax(view_min_width + border_width, fmin(width, view_max_width - border_width)), 1);
|
||||||
height = fmax(view_min_height + border_height, fmin(height, view_max_height));
|
height = fmax(fmax(view_min_height + border_height, fmin(height, view_max_height - border_height)), 1);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue