mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-06 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix gaps issues

Browse source 
* In layout command, arrange parent of parent - not sure why this is
needed but it is
* Remove gap adjustment when rendering
* Workspace should use outer gaps, not inner
* Add exceptions for tabbed and stacked containers
* Don't mess with gap state when splitting a container
This commit is contained in:
Ryan Dwyer 2018-08-28 23:53:51 +10:00
parent f5b9815128
commit 126a82f14f
4 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/tree/container.c
View file

@ -1159,7 +1159,17 @@ void container_add_gaps(struct sway_container *c) {
"Expected a container or view")) {
return;
}
if (c->current_gaps > 0 || c->type != C_VIEW) {
if (c->current_gaps > 0) {
return;
}
// Linear containers don't have gaps because it'd create double gaps
if (c->type == C_CONTAINER &&
c->layout != L_TABBED && c->layout != L_STACKED) {
return;
}
// Children of tabbed/stacked containers re-use the gaps of the container
enum sway_container_layout layout = c->parent->layout;
if (layout == L_TABBED || layout == L_STACKED) {
return;
}
@ -1355,20 +1365,16 @@ struct sway_container *container_split(struct sway_container *child,
wlr_log(WLR_DEBUG, "creating container %p around %p", cont, child);
child->type == C_WORKSPACE ? workspace_remove_gaps(child)
: container_remove_gaps(child);
cont->prev_split_layout = L_NONE;
cont->width = child->width;
cont->height = child->height;
cont->x = child->x;
cont->y = child->y;
cont->current_gaps = child->current_gaps;
struct sway_seat *seat = input_manager_get_default_seat(input_manager);
bool set_focus = (seat_get_focus(seat) == child);
container_add_gaps(cont);
if (child->type == C_WORKSPACE) {
struct sway_container *workspace = child;
while (workspace->children->length) {