PolytreeDE
/
polybar
mirror of https://github.com/polybar/polybar.git
1
0
Fork 0
Code Releases Activity

refactor(cursor): Include double clicks and fix scroll to click changes

This commit is contained in:
NBonaparte 2017-09-16 19:17:07 -07:00
parent 81c83c4364
commit 70023b07c1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/bar.cpp
View File

@ -616,8 +616,7 @@ void bar::handle(const evt::motion_notify& evt) {
// scroll cursor is less important than click cursor, so we shouldn't return until we are sure there is no click action // scroll cursor is less important than click cursor, so we shouldn't return until we are sure there is no click action
bool found_scroll = false; bool found_scroll = false;
const auto find_click_area = [&](const action& action) { const auto find_click_area = [&](const action& action) {
if (!m_opts.cursor_click.empty() && if (!m_opts.cursor_click.empty() && !(action.button == mousebtn::SCROLL_UP || action.button == mousebtn::SCROLL_DOWN || action.button == mousebtn::NONE)) {
(action.button == mousebtn::LEFT || action.button == mousebtn::MIDDLE || action.button == mousebtn::RIGHT)) {
if (!string_util::compare(m_opts.cursor, m_opts.cursor_click)) { if (!string_util::compare(m_opts.cursor, m_opts.cursor_click)) {
m_opts.cursor = m_opts.cursor_click; m_opts.cursor = m_opts.cursor_click;
m_sig.emit(cursor_change{string{m_opts.cursor}}); m_sig.emit(cursor_change{string{m_opts.cursor}});
@ -625,11 +624,7 @@ void bar::handle(const evt::motion_notify& evt) {
return true; return true;
} else if (!m_opts.cursor_scroll.empty() && (action.button == mousebtn::SCROLL_UP || action.button == mousebtn::SCROLL_DOWN)) { } else if (!m_opts.cursor_scroll.empty() && (action.button == mousebtn::SCROLL_UP || action.button == mousebtn::SCROLL_DOWN)) {
if (!found_scroll) { if (!found_scroll) {
if (!string_util::compare(m_opts.cursor, m_opts.cursor_scroll)) {
found_scroll = true; found_scroll = true;
} else {
return true;
}
} }
} }
return false; return false;
@ -643,8 +638,10 @@ void bar::handle(const evt::motion_notify& evt) {
} }
} }
if(found_scroll) { if(found_scroll) {
m_opts.cursor = m_opts.cursor_scroll; if (!string_util::compare(m_opts.cursor, m_opts.cursor_scroll)) {
m_sig.emit(cursor_change{string{m_opts.cursor}}); m_opts.cursor = m_opts.cursor_scroll;
m_sig.emit(cursor_change{string{m_opts.cursor}});
}
return; return;
} }
for (auto&& action : m_opts.actions) { for (auto&& action : m_opts.actions) {
@ -655,8 +652,10 @@ void bar::handle(const evt::motion_notify& evt) {
} }
} }
if(found_scroll) { if(found_scroll) {
m_opts.cursor = m_opts.cursor_scroll; if (!string_util::compare(m_opts.cursor, m_opts.cursor_scroll)) {
m_sig.emit(cursor_change{string{m_opts.cursor}}); m_opts.cursor = m_opts.cursor_scroll;
m_sig.emit(cursor_change{string{m_opts.cursor}});
}
return; return;
} }
if (!string_util::compare(m_opts.cursor, "default")) { if (!string_util::compare(m_opts.cursor, "default")) {