mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: don't expand separator_block_width if separator is false

Browse source 
When swaybar receives the following JSON body

    [
        {
            "full_text": "foo",
            "separator": false,
            "separator_block_width": 0
        },
        {
            "full_text": "bar"
        }
    ]

it should not draw any separator or any space between the two blocks.
However, since swaybar calculates that separator_block_width
0 is too small to fit any configured separator, it will override the
separator_block_width with some non-zero value. This patch changes
that such that the necessary separator_block_width is only expanded if
the block has 'separator: true'.

This should be in line to what i3 does, as its documentation of the
i3bar protocol for separator states that "[...] if you disable the
separator line, there will still be a gap after the block, unless you
also use separator_block_width".
This commit is contained in:
Ludvig Michaelsson 2020-09-20 17:26:18 +02:00 committed by Simon Ser
parent ed247c031c
commit d6ac30753d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
swaybar/render.c
View file

@ -208,7 +208,7 @@ static uint32_t render_status_block(cairo_t *cairo,
output->height < _ideal_surface_height) { output->height < _ideal_surface_height) {
return _ideal_surface_height; return _ideal_surface_height;
} }
if (sep_width > sep_block_width) { if (block->separator && sep_width > sep_block_width) {
sep_block_width = sep_width + margin * 2; sep_block_width = sep_width + margin * 2;
} }
} }