diff options
author | Ludvig Michaelsson <ludvig.michaelsson@gmail.com> | 2020-09-20 17:26:18 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-10-12 16:02:41 +0200 |
commit | d6ac30753ded44c5f1921a3bbccb5856d5ef6539 (patch) | |
tree | 50475c92ec38ca6cf04495ba1f6b2d63c11c3dc7 | |
parent | input/tablet: add tool_mode option to set tablet tools as relative input (diff) | |
download | sway-d6ac30753ded44c5f1921a3bbccb5856d5ef6539.tar.gz sway-d6ac30753ded44c5f1921a3bbccb5856d5ef6539.tar.zst sway-d6ac30753ded44c5f1921a3bbccb5856d5ef6539.zip |
swaybar: don't expand separator_block_width if separator is false
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".
-rw-r--r-- | swaybar/render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/render.c b/swaybar/render.c index 8f38174f..8816abef 100644 --- a/swaybar/render.c +++ b/swaybar/render.c | |||
@@ -208,7 +208,7 @@ static uint32_t render_status_block(cairo_t *cairo, | |||
208 | output->height < _ideal_surface_height) { | 208 | output->height < _ideal_surface_height) { |
209 | return _ideal_surface_height; | 209 | return _ideal_surface_height; |
210 | } | 210 | } |
211 | if (sep_width > sep_block_width) { | 211 | if (block->separator && sep_width > sep_block_width) { |
212 | sep_block_width = sep_width + margin * 2; | 212 | sep_block_width = sep_width + margin * 2; |
213 | } | 213 | } |
214 | } | 214 | } |