nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a reasonable default sep_block_width if a separator_symbol is given

This commit is contained in:
Ingo Bürk 2015-04-03 22:54:59 +02:00 committed by Michael Stapelberg
parent 483a51a2f2
commit 40b9048102
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/userguide
View File

@ -1252,8 +1252,7 @@ bar {
=== Custom separator symbol === Custom separator symbol
Specifies a custom symbol to be used for the separator as opposed to the vertical, Specifies a custom symbol to be used for the separator as opposed to the vertical,
one pixel thick separator. Note that you may have to adjust the +sep_block_width+ one pixel thick separator.
property.
*Syntax*: *Syntax*:
------------------------- -------------------------

3
i3bar/include/xcb.h
View File

@ -44,6 +44,9 @@ struct xcb_color_strings_t {
typedef struct xcb_colors_t xcb_colors_t; typedef struct xcb_colors_t xcb_colors_t;
/* Cached width of the custom separator if one was set */
int separator_symbol_width;
/* /*
* Early initialization of the connection to X11: Everything which does not * Early initialization of the connection to X11: Everything which does not
* depend on 'config'. * depend on 'config'.

5
i3bar/src/child.c
View File

@ -162,7 +162,10 @@ static int stdin_start_map(void *context) {
memset(&(ctx->block), '\0', sizeof(struct status_block)); memset(&(ctx->block), '\0', sizeof(struct status_block));
/* Default width of the separator block. */ /* Default width of the separator block. */
ctx->block.sep_block_width = logical_px(9); if (config.separator_symbol == NULL)
ctx->block.sep_block_width = logical_px(9);
else
ctx->block.sep_block_width = logical_px(8) + separator_symbol_width;
return 1; return 1;
} }

3
i3bar/src/xcb.c
View File

@ -63,9 +63,6 @@ static i3Font font;
/* Overall height of the bar (based on font size) */ /* Overall height of the bar (based on font size) */
int bar_height; int bar_height;
/* Cached width of the custom separator if one was set */
int separator_symbol_width;
/* These are only relevant for XKB, which we only need for grabbing modifiers */ /* These are only relevant for XKB, which we only need for grabbing modifiers */
int xkb_base; int xkb_base;
int mod_pressed = 0; int mod_pressed = 0;