summaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-28 23:53:51 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-28 23:53:51 +1000
commit126a82f14ff47925c7f88523ed9abe0ae9aeb7e8 (patch)
tree7cdac6c37f6ad87c056690bdeac3d5ea0489668d /sway/desktop/render.c
parentPrepare arrange code for type safe arguments (diff)
downloadsway-126a82f14ff47925c7f88523ed9abe0ae9aeb7e8.tar.gz
sway-126a82f14ff47925c7f88523ed9abe0ae9aeb7e8.tar.zst
sway-126a82f14ff47925c7f88523ed9abe0ae9aeb7e8.zip
Fix gaps issues
* 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
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r--sway/desktop/render.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index b52dd196..5556e5b3 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -619,9 +619,7 @@ static void render_container_tabbed(struct sway_output *output,
619 struct sway_container *current = pstate->focused_inactive_child; 619 struct sway_container *current = pstate->focused_inactive_child;
620 struct border_colors *current_colors = &config->border_colors.unfocused; 620 struct border_colors *current_colors = &config->border_colors.unfocused;
621 621
622 double width_gap_adjustment = 2 * pstate->current_gaps; 622 int tab_width = (pstate->swayc_width) / pstate->children->length;
623 int tab_width =
624 (pstate->swayc_width - width_gap_adjustment) / pstate->children->length;
625 623
626 // Render tabs 624 // Render tabs
627 for (int i = 0; i < pstate->children->length; ++i) { 625 for (int i = 0; i < pstate->children->length; ++i) {
@@ -656,8 +654,7 @@ static void render_container_tabbed(struct sway_output *output,
656 654
657 // Make last tab use the remaining width of the parent 655 // Make last tab use the remaining width of the parent
658 if (i == pstate->children->length - 1) { 656 if (i == pstate->children->length - 1) {
659 tab_width = 657 tab_width = pstate->swayc_width - tab_width * i;
660 pstate->swayc_width - width_gap_adjustment - tab_width * i;
661 } 658 }
662 659
663 render_titlebar(output, damage, child, x, pstate->swayc_y, tab_width, 660 render_titlebar(output, damage, child, x, pstate->swayc_y, tab_width,