From 9936d049cf7c5acf0af24f335b3bc6cca49ddbee Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Sat, 15 Sep 2018 13:27:18 +0300 Subject: [PATCH] i3bar: Include sb_hoff_px only when needed Fixes #3404. --- i3bar/src/xcb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index ae6c0abc..0719576d 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -501,7 +501,7 @@ void handle_button(xcb_button_press_event_t *event) { * check if a status block has been clicked. */ int tray_width = get_tray_width(walk->trayclients); int block_x = 0, last_block_x; - int offset = walk->rect.w - walk->statusline_width - tray_width - logical_px(sb_hoff_px); + int offset = walk->rect.w - walk->statusline_width - tray_width - logical_px((tray_width > 0) * sb_hoff_px); int32_t statusline_x = x - offset; if (statusline_x >= 0 && statusline_x < walk->statusline_width) { @@ -2005,7 +2005,8 @@ void draw_bars(bool unhide) { DLOG("Printing statusline!\n"); int tray_width = get_tray_width(outputs_walk->trayclients); - uint32_t max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px); + uint32_t hoff = logical_px(((workspace_width > 0) + (tray_width > 0)) * sb_hoff_px); + uint32_t max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - hoff; uint32_t clip_left = 0; uint32_t statusline_width = full_statusline_width; bool use_short_text = false; @@ -2019,7 +2020,7 @@ void draw_bars(bool unhide) { } int16_t visible_statusline_width = MIN(statusline_width, max_statusline_width); - int x_dest = outputs_walk->rect.w - tray_width - logical_px(sb_hoff_px) - visible_statusline_width; + int x_dest = outputs_walk->rect.w - tray_width - logical_px((tray_width > 0) * sb_hoff_px) - visible_statusline_width; draw_statusline(outputs_walk, clip_left, use_focus_colors, use_short_text); draw_util_copy_surface(&outputs_walk->statusline_buffer, &outputs_walk->buffer, 0, 0,