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

MenuView bugfix (again)

Browse Source 
Updated binary
This commit is contained in:
furrtek 2017-12-10 03:34:11 +00:00
parent 65a99bbe5a
commit 2d01822cdb
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
firmware/application/ui_menu.cpp
View File

@ -31,14 +31,6 @@ void MenuItemView::set_item(MenuItem* item_) {
item = item_; item = item_;
} }
void MenuItemView::select() {
if (!item) return;
if( item->on_select ) {
item->on_select();
}
}
void MenuItemView::highlight() { void MenuItemView::highlight() {
set_highlighted(true); set_highlighted(true);
set_dirty(); set_dirty();
@ -135,9 +127,9 @@ void MenuView::set_parent_rect(const Rect new_parent_rect) {
remove_child(item); remove_child(item);
delete item; delete item;
} }
menu_item_views.clear();
} }
menu_item_views.clear();
for (size_t c = 0; c < displayed_max; c++) { for (size_t c = 0; c < displayed_max; c++) {
auto item = new MenuItemView { keep_highlight }; auto item = new MenuItemView { keep_highlight };
@ -225,12 +217,12 @@ bool MenuView::set_highlighted(int32_t new_value) {
if (((uint32_t)new_value > offset) && ((new_value - offset) >= displayed_max)) { if (((uint32_t)new_value > offset) && ((new_value - offset) >= displayed_max)) {
// Shift MenuView up // Shift MenuView up
highlighted_item = new_value; highlighted_item = new_value;
offset = new_value - displayed_max + 1; offset = new_value - displayed_max + 1;
update_items(); update_items();
} else if ((uint32_t)new_value < offset) { } else if ((uint32_t)new_value < offset) {
// Shift MenuView down // Shift MenuView down
highlighted_item = new_value; highlighted_item = new_value;
offset = new_value; offset = new_value;
update_items(); update_items();
} else { } else {
@ -248,11 +240,12 @@ uint32_t MenuView::highlighted_index() {
} }
void MenuView::on_focus() { void MenuView::on_focus() {
item_view(highlighted_item)->highlight(); item_view(highlighted_item - offset)->highlight();
} }
void MenuView::on_blur() { void MenuView::on_blur() {
if (!keep_highlight) item_view(highlighted_item)->unhighlight(); if (!keep_highlight)
item_view(highlighted_item - offset)->unhighlight();
} }
bool MenuView::on_key(const KeyEvent key) { bool MenuView::on_key(const KeyEvent key) {
@ -265,7 +258,9 @@ bool MenuView::on_key(const KeyEvent key) {
case KeyEvent::Select: case KeyEvent::Select:
case KeyEvent::Right: case KeyEvent::Right:
item_view(highlighted_item - offset)->select(); if( menu_items[highlighted_item].on_select ) {
menu_items[highlighted_item].on_select();
}
return true; return true;
case KeyEvent::Left: case KeyEvent::Left:

1
firmware/application/ui_menu.hpp
View File

@ -63,7 +63,6 @@ public:
void set_item(MenuItem* item_); void set_item(MenuItem* item_);
void select();
void highlight(); void highlight();
void unhighlight(); void unhighlight();

BIN
firmware/portapack-h1-havoc.bin
View File

Binary file not shown.