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

Prevent workspace gaps from ending up negative

Browse source 
Since outer gaps can be negative we need to robustly prevent the
resulting gaps from ending up negative. The previous code only did this
on workspace creation but the gaps can change after that.

Fixes #4304
This commit is contained in:
Pedro Côrte-Real 2019-07-04 19:44:29 +01:00
parent 9cbf3bec9d
commit f66eb115ce
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sway/tree/workspace.c
View file

@ -54,21 +54,6 @@ struct sway_output *workspace_get_initial_output(const char *name) {
return root->outputs->length ? root->outputs->items[0] : root->noop_output; return root->outputs->length ? root->outputs->items[0] : root->noop_output;
} }
static void prevent_invalid_outer_gaps(struct sway_workspace *ws) {
if (ws->gaps_outer.top < -ws->gaps_inner) {
ws->gaps_outer.top = -ws->gaps_inner;
}
if (ws->gaps_outer.right < -ws->gaps_inner) {
ws->gaps_outer.right = -ws->gaps_inner;
}
if (ws->gaps_outer.bottom < -ws->gaps_inner) {
ws->gaps_outer.bottom = -ws->gaps_inner;
}
if (ws->gaps_outer.left < -ws->gaps_inner) {
ws->gaps_outer.left = -ws->gaps_inner;
}
}
struct sway_workspace *workspace_create(struct sway_output *output, struct sway_workspace *workspace_create(struct sway_output *output,
const char *name) { const char *name) {
if (output == NULL) { if (output == NULL) {
@ -111,9 +96,6 @@ struct sway_workspace *workspace_create(struct sway_output *output,
if (wsc->gaps_inner != INT_MIN) { if (wsc->gaps_inner != INT_MIN) {
ws->gaps_inner = wsc->gaps_inner; ws->gaps_inner = wsc->gaps_inner;
} }
// Since default outer gaps can be smaller than the negation of
// workspace specific inner gaps, check outer gaps again
prevent_invalid_outer_gaps(ws);
// Add output priorities // Add output priorities
for (int i = 0; i < wsc->outputs->length; ++i) { for (int i = 0; i < wsc->outputs->length; ++i) {
@ -743,6 +725,14 @@ void workspace_add_gaps(struct sway_workspace *ws) {
ws->current_gaps.right += ws->gaps_inner; ws->current_gaps.right += ws->gaps_inner;
ws->current_gaps.bottom += ws->gaps_inner; ws->current_gaps.bottom += ws->gaps_inner;
ws->current_gaps.left += ws->gaps_inner; ws->current_gaps.left += ws->gaps_inner;
// Prevent the resulting gaps from turning out negative, since outer gaps
// can be negative and nothing ensures they will not be larger than the
// current inner gaps.
ws->current_gaps.left = MAX(0, ws->current_gaps.left);
ws->current_gaps.right = MAX(0, ws->current_gaps.right);
ws->current_gaps.top = MAX(0, ws->current_gaps.top);
ws->current_gaps.bottom = MAX(0, ws->current_gaps.bottom);
} else { } else {
// For tiled containers we need to add the half-gap all around the edge // For tiled containers we need to add the half-gap all around the edge
// to match the half gaps that the children have all already added around // to match the half gaps that the children have all already added around
@ -757,6 +747,14 @@ void workspace_add_gaps(struct sway_workspace *ws) {
int gaps_vertical2 = ws->gaps_inner - gaps_vertical1; int gaps_vertical2 = ws->gaps_inner - gaps_vertical1;
ws->current_gaps.top += gaps_vertical2; ws->current_gaps.top += gaps_vertical2;
ws->current_gaps.bottom += gaps_vertical1; ws->current_gaps.bottom += gaps_vertical1;
// Prevent the resulting gaps from turning out negative, since outer gaps
// can be negative and nothing ensures they will not be larger than the
// current inner gaps.
ws->current_gaps.left = MAX(-gaps_horizontal1, ws->current_gaps.left);
ws->current_gaps.right = MAX(-gaps_horizontal2, ws->current_gaps.right);
ws->current_gaps.top = MAX(-gaps_vertical1, ws->current_gaps.top);
ws->current_gaps.bottom = MAX(-gaps_vertical2, ws->current_gaps.bottom);
} }
// Now that we have the total gaps calculated we may need to clamp them in // Now that we have the total gaps calculated we may need to clamp them in