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

Nav stack cleanup (#1460)

Browse Source 
* Minor nav stack fixes
* Nav stack cleanup
* Additional cleanup, fix notepad crash
* Fix abort/cancel
* Fix for nasty focus bug
* Format
This commit is contained in:
Kyle Reed
2023-09-27 12:03:02 -07:00
committed by GitHub
parent a6a1483083
commit fb00bfac3f
19 changed files with 116 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/ui/ui_geomap.cpp
View File

@@ -413,7 +413,7 @@ void GeoMapView::focus() {
geopos.focus();
if (!map_opened)
nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr);
nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT);
}
void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t altitude) {

3
firmware/application/ui/ui_receiver.cpp
View File

@@ -273,9 +273,8 @@ FrequencyKeypadView::FrequencyKeypadView(
};
button_close.on_select = [this, &nav](Button&) {
if (on_changed) {
if (on_changed)
on_changed(this->value());
}
nav.pop();
};

8
firmware/application/ui/ui_textentry.cpp
View File

@@ -41,20 +41,12 @@ void text_prompt(
uint32_t cursor_pos,
size_t max_length,
std::function<void(std::string&)> on_done) {
// if (persistent_memory::ui_config_textentry() == 0) {
auto te_view = nav.push<AlphanumView>(str, max_length);
te_view->set_cursor(cursor_pos);
te_view->on_changed = [on_done](std::string& value) {
if (on_done)
on_done(value);
};
/*} else {
auto te_view = nav.push<HandWriteView>(str, max_length);
te_view->on_changed = [on_done](std::string * value) {
if (on_done)
on_done(value);
};
}*/
}
/* TextEntryView ***********************************************************/