mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 13:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix resize sibling amount calculations

Browse source 
Sibling amounts were being calculated after the original fraction had
been altered. This led to broken resize amounts. Fix that by calculating
things upfront before adjusting values which also makes the code
cleaner.

For sanity checks also calculate the sibling amount with the
ceiling so we never go below the sanity check even by one pixel.

Fixes #4386
This commit is contained in:
Pedro Côrte-Real 2019-07-28 02:44:32 +01:00 committed by Brian Ashworth
parent f984f21b6a
commit cefc608cb9
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sway/commands/resize.c
View file

@ -160,7 +160,7 @@ void container_resize_tiled(struct sway_container *con,
} }
// Apply new dimensions // Apply new dimensions
int sibling_amount = prev ? amount / 2 : amount; int sibling_amount = prev ? ceil((double)amount / 2.0) : amount;
if (is_horizontal(axis)) { if (is_horizontal(axis)) {
if (con->width + amount < MIN_SANE_W) { if (con->width + amount < MIN_SANE_W) {
@ -173,13 +173,15 @@ void container_resize_tiled(struct sway_container *con,
return; return;
} }
con->width_fraction += double amount_fraction =
((double)amount / con->width) * con->width_fraction; ((double)amount / con->width) * con->width_fraction;
next->width_fraction -= double sibling_amount_fraction =
((double)sibling_amount / con->width) * con->width_fraction; prev ? amount_fraction / 2.0 : amount_fraction;
con->width_fraction += amount_fraction;
next->width_fraction -= sibling_amount_fraction;
if (prev) { if (prev) {
prev->width_fraction -= prev->width_fraction -= sibling_amount_fraction;
((double)sibling_amount / con->width) * con->width_fraction;
} }
} else { } else {
if (con->height + amount < MIN_SANE_H) { if (con->height + amount < MIN_SANE_H) {
@ -192,13 +194,15 @@ void container_resize_tiled(struct sway_container *con,
return; return;
} }
con->height_fraction += double amount_fraction =
((double)amount / con->height) * con->height_fraction; ((double)amount / con->height) * con->height_fraction;
next->height_fraction -= double sibling_amount_fraction =
((double)sibling_amount / con->height) * con->height_fraction; prev ? amount_fraction / 2.0 : amount_fraction;
con->height_fraction += amount_fraction;
next->height_fraction -= sibling_amount_fraction;
if (prev) { if (prev) {
prev->height_fraction -= prev->height_fraction -= sibling_amount_fraction;
((double)sibling_amount / con->height) * con->height_fraction;
} }
} }