alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2929 from RyanDwyer/fix-scratchpad-resize

Browse source 
Fix crash when resizing container hidden in the scratchpad
This commit is contained in:
Drew DeVault 2018-10-22 23:45:22 +02:00 committed by GitHub
parent d9ed9445de bb06a57a71
commit 40c98768e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/resize.c
View file

@ -94,7 +94,7 @@ static void calculate_constraints(int *min_width, int *max_width,
*min_height = config->floating_minimum_height; *min_height = config->floating_minimum_height;
} }
if (config->floating_maximum_width == -1) { // no maximum if (config->floating_maximum_width == -1 || !con->workspace) { // no max
*max_width = INT_MAX; *max_width = INT_MAX;
} else if (config->floating_maximum_width == 0) { // automatic } else if (config->floating_maximum_width == 0) { // automatic
*max_width = con->workspace->width; *max_width = con->workspace->width;
@ -102,7 +102,7 @@ static void calculate_constraints(int *min_width, int *max_width,
*max_width = config->floating_maximum_width; *max_width = config->floating_maximum_width;
} }
if (config->floating_maximum_height == -1) { // no maximum if (config->floating_maximum_height == -1 || !con->workspace) { // no max
*max_height = INT_MAX; *max_height = INT_MAX;
} else if (config->floating_maximum_height == 0) { // automatic } else if (config->floating_maximum_height == 0) { // automatic
*max_height = con->workspace->height; *max_height = con->workspace->height;

10
sway/tree/container.c
View file

@ -727,8 +727,14 @@ void container_set_geometry_from_floating_view(struct sway_container *con) {
} }
bool container_is_floating(struct sway_container *container) { bool container_is_floating(struct sway_container *container) {
return !container->parent && container->workspace && if (!container->parent && container->workspace &&
list_find(container->workspace->floating, container) != -1; list_find(container->workspace->floating, container) != -1) {
return true;
}
if (container->scratchpad) {
return true;
}
return false;
} }
void container_get_box(struct sway_container *container, struct wlr_box *box) { void container_get_box(struct sway_container *container, struct wlr_box *box) {