Use a reasonable default sep_block_width if a separator_symbol is given

diff --git a/docs/userguide b/docs/userguide
index 547c7ba7d3e0602c84dab3e0f6e9c917aec788bf..687dff10e5221c48ebfd3f3f1207eff76c4199c8 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -1319,8 +1319,7 @@ bar {
 === Custom separator symbol
 
 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+ 
-property.
+one pixel thick separator.
 
 *Syntax*:
 -------------------------

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 8e48c0c138e0734ea34ea77eae1ceddd689107c8..bb37e7d517921066922fca075ff6b591421c7834 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -44,6 +44,9 @@ struct xcb_color_strings_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
  * depend on 'config'.

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 9cc50f2a25f7b5e3a3d9bb0981ecc4ea93ee8be3..41f8880dd2b736f6c0b4fa3af41723f2aae5145e 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -162,7 +162,10 @@ static int stdin_start_map(void *context) {
     memset(&(ctx->block), '\0', sizeof(struct status_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;
 }

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index e53b92262df976bd99d3bdccdfded1e04915c98a..ba57b9fa397d11a8fabc238da2727ba09c4095ab 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -63,9 +63,6 @@ static i3Font font;
 /* Overall height of the bar (based on font size) */
 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 */
 int xkb_base;
 int mod_pressed = 0;