portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-11 00:59:28 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix shift key position (#2850)

Browse Source
This commit is contained in:
Totoo
2025-10-31 18:25:23 +01:00
committed by GitHub
parent 113cbc42c9
commit 00c9c6b40e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui/ui_alphanum.hpp
+1 -1
View File
@@ -81,7 +81,7 @@ class AlphanumView : public TextEntryView {
std::array<Button, 29> buttons{}; std::array<Button, 29> buttons{};
NewButton button_shift{ NewButton button_shift{
{192, 214, screen_width / 5, 38}, {screen_width - screen_width / 5, 214, screen_width / 5, 38},
{}, {},
&bitmap_icon_shift, &bitmap_icon_shift,
Theme::getInstance()->bg_dark->background, Theme::getInstance()->bg_dark->background,
firmware/application/ui_navigation.cpp
+3 -4
View File
@@ -769,9 +769,9 @@ void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc) {
} }
// clang-format off // clang-format off
void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos) { void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos, bool show_error_tile ) {
auto externalItems = ExternalItemsMenuLoader::load_external_items(location, nav); auto externalItems = ExternalItemsMenuLoader::load_external_items(location, nav);
if (externalItems.empty()) { if (externalItems.empty() && show_error_tile) {
grid.insert_item({"ExtAppErr", grid.insert_item({"ExtAppErr",
Theme::getInstance()->error_dark->foreground, Theme::getInstance()->error_dark->foreground,
nullptr, nullptr,
@@ -848,8 +848,7 @@ void TranceiversMenuView::on_populate() {
add_items({{"..", Theme::getInstance()->fg_light->foreground, &bitmap_icon_previous, [this]() { nav_.pop(); }}}); add_items({{"..", Theme::getInstance()->fg_light->foreground, &bitmap_icon_previous, [this]() { nav_.pop(); }}});
} }
add_apps(nav_, *this, TRX); add_apps(nav_, *this, TRX);
// add_external_items(nav_, app_location_t::TRX, *this, return_icon ? 1 : 0); add_external_items(nav_, app_location_t::TRX, *this, return_icon ? 1 : 0, false); // this folder doesn't have external apps, so don't show error for it.
// this folder doesn't have external apps, comment to prevent pop the err msg.
// NB: when has external app someday, uncomment this. // NB: when has external app someday, uncomment this.
} }
firmware/application/ui_navigation.hpp
+1 -1
View File
@@ -61,7 +61,7 @@ using namespace sd_card;
namespace ui { namespace ui {
void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc); void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc);
void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos); void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos, bool show_error_tile = true);
bool verify_sdcard_format(); bool verify_sdcard_format();
enum modal_t { enum modal_t {