Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix butngrid/capture and fix contributor name (#1995)

Browse Source 
* fixing contributor name

* used clear instead of swap

---------

Co-authored-by: GullCode <gullradriel@hotmail.com>
This commit is contained in:
gullradriel 2024-03-15 17:39:34 +01:00 committed by GitHub
parent 9e40e38f07
commit 01e4ff65a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/application/apps/ui_about_simple.cpp
View File

@ -13,7 +13,7 @@ AboutView::AboutView(NavigationView& nav) {
} }
void AboutView::update() { void AboutView::update() {
if (++timer > 200) { if (++timer > 400) {
timer = 0; timer = 0;
switch (++frame) { switch (++frame) {
@ -23,7 +23,7 @@ void AboutView::update() {
console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:"); console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:");
console.writeln("eried,euquiq,gregoryfenton"); console.writeln("eried,euquiq,gregoryfenton");
console.writeln("johnelder,jwetzell,nnemanjan00"); console.writeln("johnelder,jwetzell,nnemanjan00");
console.writeln("N0vaPixel,klockee,GullCode"); console.writeln("N0vaPixel,klockee,gullradriel");
console.writeln("jamesshao8,ITAxReal,rascafr"); console.writeln("jamesshao8,ITAxReal,rascafr");
console.writeln("mcules,dqs105,strijar"); console.writeln("mcules,dqs105,strijar");
console.writeln("zhang00963,RedFox-Fr,aldude999"); console.writeln("zhang00963,RedFox-Fr,aldude999");

6
firmware/application/ui/ui_btngrid.cpp
View File

@ -107,12 +107,14 @@ void BtnGridView::on_tick_second() {
} }
void BtnGridView::clear() { void BtnGridView::clear() {
std::vector<GridItem>().swap(menu_items); // clear vector and release memory // clear vector and release memory, not using swap since it's causing capture to glitch/fault
menu_items.clear();
for (auto& item : menu_item_views) for (auto& item : menu_item_views)
remove_child(item.get()); remove_child(item.get());
std::vector<std::unique_ptr<NewButton>>().swap(menu_item_views); // clear vector and release memory // clear vector and release memory, not using swap since it's causing capture to glitch/fault
menu_item_views.clear();
} }
void BtnGridView::add_items(std::initializer_list<GridItem> new_items) { void BtnGridView::add_items(std::initializer_list<GridItem> new_items) {