Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-12 11:42:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move nav back button outside of ReceiverView.

Browse source
This commit is contained in:
Jared Boone 2016-01-25 11:13:19 -08:00
parent 029a44e24c
commit 15800eea33
4 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
firmware/application/ui_navigation.cpp
View file

@ -40,14 +40,29 @@ namespace ui {
SystemStatusView::SystemStatusView() {
add_children({ {
&button_back,
&portapack,
&sd_card_status_view,
} });
sd_card_status_view.set_parent_rect({ 28 * 8, 0 * 16, 2 * 8, 1 * 16 });
button_back.on_select = [this](Button&){
if( this->on_back ) {
this->on_back();
}
};
}
void SystemStatusView::set_back_visible(bool new_value) {
button_back.hidden(!new_value);
}
/* Navigation ************************************************************/
bool NavigationView::is_top() const {
return view_stack.size() == 1;
}
View* NavigationView::push_view(std::unique_ptr<View> new_view) {
free_view();
@ -80,6 +95,10 @@ void NavigationView::update_view() {
new_view->set_parent_rect({ {0, 0}, size() });
focus();
set_dirty();
if( on_view_changed ) {
on_view_changed();
}
}
Widget* NavigationView::view() const {
@ -148,12 +167,18 @@ SystemView::SystemView(
{ 0, 0 },
{ parent_rect.width(), status_view_height }
});
status_view.on_back = [this]() {
this->navigation_view.pop();
};
add_child(&navigation_view);
navigation_view.set_parent_rect({
{ 0, status_view_height },
{ parent_rect.width(), static_cast<ui::Dim>(parent_rect.height() - status_view_height) }
});
navigation_view.on_view_changed = [this]() {
this->status_view.set_back_visible(!this->navigation_view.is_top());
};
// Initial view.
// TODO: Restore from non-volatile memory?