Merge pull request #3701 from orestisf1993/click-events

i3bar: If click events disabled, use whole bar for other events
This commit is contained in:
Ingo Bürk 2019-05-14 15:23:28 +02:00 committed by GitHub
commit f2c7e26a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions

View File

@ -455,10 +455,6 @@ static bool execute_custom_command(xcb_keycode_t input_code, bool event_is_relea
} }
static void child_handle_button(xcb_button_press_event_t *event, i3_output *output, uint32_t statusline_x) { static void child_handle_button(xcb_button_press_event_t *event, i3_output *output, uint32_t statusline_x) {
if (!child_want_click_events()) {
return;
}
if (statusline_x > (uint32_t)output->statusline_width) { if (statusline_x > (uint32_t)output->statusline_width) {
return; return;
} }
@ -543,7 +539,7 @@ static void handle_button(xcb_button_press_event_t *event) {
workspace_width += logical_px(ws_spacing_px); workspace_width += logical_px(ws_spacing_px);
} }
if (x > workspace_width) { if (child_want_click_events() && x > workspace_width) {
const int tray_width = get_tray_width(walk->trayclients); const int tray_width = get_tray_width(walk->trayclients);
/* Calculate the horizontal coordinate (x) of the start of the /* Calculate the horizontal coordinate (x) of the start of the
* statusline by subtracting its width and the width of the tray from * statusline by subtracting its width and the width of the tray from