Skip to content

Commit

Permalink
fix butngrid/capture and fix contributor name (#1995)
Browse files Browse the repository at this point in the history
* fixing contributor name

* used clear instead of swap

---------

Co-authored-by: GullCode <gullradriel@hotmail.com>
  • Loading branch information
gullradriel and GullCode authored Mar 15, 2024
1 parent 9e40e38 commit 01e4ff6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions firmware/application/apps/ui_about_simple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AboutView::AboutView(NavigationView& nav) {
}

void AboutView::update() {
if (++timer > 200) {
if (++timer > 400) {
timer = 0;

switch (++frame) {
Expand All @@ -23,7 +23,7 @@ void AboutView::update() {
console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:");
console.writeln("eried,euquiq,gregoryfenton");
console.writeln("johnelder,jwetzell,nnemanjan00");
console.writeln("N0vaPixel,klockee,GullCode");
console.writeln("N0vaPixel,klockee,gullradriel");
console.writeln("jamesshao8,ITAxReal,rascafr");
console.writeln("mcules,dqs105,strijar");
console.writeln("zhang00963,RedFox-Fr,aldude999");
Expand Down
6 changes: 4 additions & 2 deletions firmware/application/ui/ui_btngrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,14 @@ void BtnGridView::on_tick_second() {
}

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)
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) {
Expand Down

0 comments on commit 01e4ff6

Please sign in to comment.