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

Merge pull request #3184 from kupospelov/fix-resize

Browse source 
resize set: fix units for floating containers
This commit is contained in:
emersion 2018-11-25 17:41:45 +01:00 committed by GitHub
parent d46d221118 f9bde0030d
commit 91bbb2a7dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sway/commands/resize.c
View file

@ -512,34 +512,42 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
calculate_constraints(&min_width, &max_width, &min_height, &max_height); calculate_constraints(&min_width, &max_width, &min_height, &max_height);
if (width->amount) { if (width->amount) {
if (width->unit == RESIZE_UNIT_PPT || switch (width->unit) {
width->unit == RESIZE_UNIT_DEFAULT) { case RESIZE_UNIT_PPT:
// Convert to px // Convert to px
width->amount = con->workspace->width * width->amount / 100; width->amount = con->workspace->width * width->amount / 100;
width->unit = RESIZE_UNIT_PX; width->unit = RESIZE_UNIT_PX;
} // Falls through
if (width->unit == RESIZE_UNIT_PX) { case RESIZE_UNIT_PX:
case RESIZE_UNIT_DEFAULT:
width->amount = fmax(min_width, fmin(width->amount, max_width)); width->amount = fmax(min_width, fmin(width->amount, max_width));
grow_width = width->amount - con->width; grow_width = width->amount - con->width;
con->x -= grow_width / 2; con->x -= grow_width / 2;
con->width = width->amount; con->width = width->amount;
break;
case RESIZE_UNIT_INVALID:
sway_assert(false, "invalid width unit");
break;
} }
} }
if (height->amount) { if (height->amount) {
if (height->unit == RESIZE_UNIT_PPT || switch (height->unit) {
height->unit == RESIZE_UNIT_DEFAULT) { case RESIZE_UNIT_PPT:
// Convert to px // Convert to px
height->amount = con->workspace->height * height->amount / 100; height->amount = con->workspace->height * height->amount / 100;
height->unit = RESIZE_UNIT_PX; height->unit = RESIZE_UNIT_PX;
} // Falls through
if (height->unit == RESIZE_UNIT_PX) { case RESIZE_UNIT_PX:
case RESIZE_UNIT_DEFAULT:
height->amount = fmax(min_height, fmin(height->amount, max_height)); height->amount = fmax(min_height, fmin(height->amount, max_height));
grow_height = height->amount - con->height; grow_height = height->amount - con->height;
con->y -= grow_height / 2; con->y -= grow_height / 2;
con->height = height->amount; con->height = height->amount;
break;
case RESIZE_UNIT_INVALID:
sway_assert(false, "invalid height unit");
break;
} }
} }