From abd30860e0c88733418e5512c3bf3005c64cc3c7 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Tue, 20 Dec 2016 15:51:45 +0100 Subject: [PATCH] fix(button_press): Use correct double click button --- src/components/bar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/bar.cpp b/src/components/bar.cpp index 97e4d0f2..d008a40b 100644 --- a/src/components/bar.cpp +++ b/src/components/bar.cpp @@ -536,9 +536,9 @@ void bar::handle(const evt::button_press& evt) { m_log.warn("No matching input area found (btn=%i)", static_cast(m_buttonpress_btn)); }; - const auto check_double = [&](const xcb_timestamp_t& timestamp, string&& id, mousebtn&& btn) { + const auto check_double = [&](string&& id, mousebtn&& btn) { if (!m_taskqueue->has_deferred(string{id})) { - m_doubleclick.event = move(timestamp); + m_doubleclick.event = evt->time; m_taskqueue->defer_unique(string{id}, chrono::milliseconds{m_doubleclick.offset}, deferred_fn); } else if (m_doubleclick.deny(evt->time)) { m_doubleclick.event = 0; @@ -548,11 +548,11 @@ void bar::handle(const evt::button_press& evt) { }; if (evt->detail == static_cast(mousebtn::LEFT)) { - check_double(evt->time, "buttonpress-left", mousebtn::LEFT); + check_double("buttonpress-left", mousebtn::DOUBLE_LEFT); } else if (evt->detail == static_cast(mousebtn::MIDDLE)) { - check_double(evt->time, "buttonpress-middle", mousebtn::MIDDLE); + check_double("buttonpress-middle", mousebtn::DOUBLE_MIDDLE); } else if (evt->detail == static_cast(mousebtn::RIGHT)) { - check_double(evt->time, "buttonpress-right", mousebtn::RIGHT); + check_double("buttonpress-right", mousebtn::DOUBLE_RIGHT); } else { deferred_fn(); }