TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-10-21 08:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Centralize handling of modal error display.

Browse Source
This commit is contained in:
Jared Boone
2016-05-17 09:33:16 -07:00
parent 682a1706a3
commit 6a3cd4c144
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/application/ui_navigation.cpp
View File

@@ -117,6 +117,10 @@ View* NavigationView::push_view(std::unique_ptr<View> new_view) {
}
void NavigationView::pop() {
if( view() == modal_view ) {
modal_view = nullptr;
}
// Can't pop last item from stack.
if( view_stack.size() > 1 ) {
free_view();
@@ -127,6 +131,13 @@ void NavigationView::pop() {
}
}
void NavigationView::display_error(const std::string& message) {
/* If a modal view is already visible, don't display another */
if( !modal_view ) {
modal_view = push<ModalMessageView>(message);
}
}
void NavigationView::free_view() {
remove_child(view());
}