TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-13 06:17:42 +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

10
firmware/common/ui_focus.cpp
View File

@@ -43,18 +43,12 @@ void FocusManager::set_focus_widget(Widget* const new_focus_widget) {
}
if (new_focus_widget) {
// if( !new_focus_widget->visible() ) {
// if( new_focus_widget->hidden() ) {
// // New widget is not visible. Do nothing.
// // TODO: Should this be a debug assertion?
// return;
// }
if (!new_focus_widget->focusable()) {
if (!new_focus_widget->focusable())
return;
}
}
// Blur old widget.
// NB: This will crash if the focus_widget is a destroyed instance.
if (focus_widget()) {
focus_widget()->on_blur();
focus_widget()->set_dirty();

2
firmware/common/ui_widget.cpp
View File

@@ -134,7 +134,6 @@ void Widget::focus() {
}
void Widget::on_focus() {
// set_dirty();
}
void Widget::blur() {
@@ -142,7 +141,6 @@ void Widget::blur() {
}
void Widget::on_blur() {
// set_dirty();
}
bool Widget::focusable() const {