Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-10 07:30:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Made back button always focusable with left key

Browse source
This commit is contained in:
furrtek 2017-04-21 00:31:21 +01:00
parent 6464cfeaef
commit eff96276c3
6 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
firmware/common/ui_focus.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2016 Furrtek
*
* This file is part of PortaPack.
*
@ -162,6 +163,13 @@ void FocusManager::update(
return { nullptr, 0 };
};
const auto find_back_fn = [](ui::Widget* const w) -> test_result_t {
if( w->focusable() && (w->id == -1) )
return { w, 0 };
else
return { nullptr, 0 };
};
test_collection_t collection;
widget_collect_visible(top_widget, test_fn, collection);
@ -175,6 +183,14 @@ void FocusManager::update(
//focus->blur();
const auto new_focus = (*nearest).first;
set_focus_widget(new_focus);
} else {
if ((focus_widget()->id >= 0) && (event == KeyEvent::Left)) {
// Stuck left, move to back button
collection.clear();
widget_collect_visible(top_widget, find_back_fn, collection);
if (!collection.empty())
set_focus_widget(collection[0].first);
}
}
}
}