pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #772 from patrick96/nested_actions

Browse source 
fix(renderer): Properly support nested actions
This commit is contained in:
Patrick Ziegler 2017-09-24 08:26:37 +02:00 committed by GitHub
commit 0a5ad9c76f
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/bar.cpp
View file

@ -689,13 +689,20 @@ void bar::handle(const evt::button_press& evt) {
m_buttonpress_pos = evt->event_x; m_buttonpress_pos = evt->event_x;
const auto deferred_fn = [&](size_t) { const auto deferred_fn = [&](size_t) {
for (auto&& action : m_renderer->actions()) { /*
if (action.button == m_buttonpress_btn && !action.active && action.test(m_buttonpress_pos)) { * Iterate over all defined actions in reverse order until matching action is found
* To properly handle nested actions we iterate in reverse because nested actions are added later than their
* surrounding action block
*/
auto actions = m_renderer->actions();
for (auto action = actions.rbegin(); action != actions.rend(); action++) {
if (action->button == m_buttonpress_btn && !action->active && action->test(m_buttonpress_pos)) {
m_log.trace("Found matching input area"); m_log.trace("Found matching input area");
m_sig.emit(button_press{string{action.command}}); m_sig.emit(button_press{string{action->command}});
return; return;
} }
} }
for (auto&& action : m_opts.actions) { for (auto&& action : m_opts.actions) {
if (action.button == m_buttonpress_btn && !action.command.empty()) { if (action.button == m_buttonpress_btn && !action.command.empty()) {
m_log.trace("Found matching fallback handler"); m_log.trace("Found matching fallback handler");

5
src/components/renderer.cpp
View file

@ -767,11 +767,16 @@ bool renderer::on(const signals::parser::action_begin& evt) {
bool renderer::on(const signals::parser::action_end& evt) { bool renderer::on(const signals::parser::action_end& evt) {
auto btn = evt.cast(); auto btn = evt.cast();
/*
* Iterate actions in reverse and find the FIRST active action that matches
*/
m_log.trace_x("renderer: action_end(btn=%i)", static_cast<int>(btn)); m_log.trace_x("renderer: action_end(btn=%i)", static_cast<int>(btn));
for (auto action = m_actions.rbegin(); action != m_actions.rend(); action++) { for (auto action = m_actions.rbegin(); action != m_actions.rend(); action++) {
if (action->active && action->align == m_align && action->button == btn) { if (action->active && action->align == m_align && action->button == btn) {
action->end_x = m_blocks.at(action->align).x; action->end_x = m_blocks.at(action->align).x;
action->active = false; action->active = false;
break;
} }
} }
return true; return true;