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

Merge pull request #381 from sce/fix_gaps

Browse source 
Fix gaps
This commit is contained in:
Drew DeVault 2015-12-20 15:44:42 -05:00
parent adf5b8fed7 f4b9c3856a
commit 5fbecba37a
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/container.c
View file

@ -671,7 +671,16 @@ int swayc_gap(swayc_t *container) {
if (container->type == C_VIEW) { if (container->type == C_VIEW) {
return container->gaps >= 0 ? container->gaps : config->gaps_inner; return container->gaps >= 0 ? container->gaps : config->gaps_inner;
} else if (container->type == C_WORKSPACE) { } else if (container->type == C_WORKSPACE) {
return container->gaps >= 0 ? container->gaps : config->gaps_outer; int base = container->gaps >= 0 ? container->gaps : config->gaps_outer;
if (config->edge_gaps) {
// the inner gap is created via a margin around each window which
// is half the gap size, so the workspace also needs half a gap
// size to make the outermost gap the same size (excluding the
// actual "outer gap" size which is handled independently)
return base + config->gaps_inner / 2;
} else {
return base;
}
} else { } else {
return 0; return 0;
} }

4
sway/layout.c
View file

@ -398,10 +398,10 @@ void update_geometry(swayc_t *container) {
geometry.size.h = container->height - gap/2; geometry.size.h = container->height - gap/2;
} }
if (container->x + container->width + gap >= ws->x + ws->width) { if (container->x + container->width + gap >= ws->x + ws->width) {
geometry.size.w = ws->width - geometry.origin.x; geometry.size.w = ws->x + ws->width - geometry.origin.x;
} }
if (container->y + container->height + gap >= ws->y + ws->height) { if (container->y + container->height + gap >= ws->y + ws->height) {
geometry.size.h = ws->height - geometry.origin.y; geometry.size.h = ws->y + ws->height - geometry.origin.y;
} }
} }
wlc_view_set_geometry(container->handle, 0, &geometry); wlc_view_set_geometry(container->handle, 0, &geometry);