|
@@ -198,13 +198,15 @@ void MenuFunctions::main()
|
|
|
for (uint8_t b = 0; b < current_menu->list->size(); b++) {
|
|
for (uint8_t b = 0; b < current_menu->list->size(); b++) {
|
|
|
display_obj.tft.setFreeFont(MENU_FONT);
|
|
display_obj.tft.setFreeFont(MENU_FONT);
|
|
|
if (display_obj.key[b].justPressed()) {
|
|
if (display_obj.key[b].justPressed()) {
|
|
|
- display_obj.key[b].drawButton2(current_menu->list->get(b).name, true); // draw invert
|
|
|
|
|
|
|
+ //display_obj.key[b].drawButton2(current_menu->list->get(b).name, true); // draw invert
|
|
|
|
|
+ display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name, true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// If button was just release, execute the button's function
|
|
// If button was just release, execute the button's function
|
|
|
if (display_obj.key[b].justReleased())
|
|
if (display_obj.key[b].justReleased())
|
|
|
{
|
|
{
|
|
|
- display_obj.key[b].drawButton2(current_menu->list->get(b).name); // draw normal
|
|
|
|
|
|
|
+ //display_obj.key[b].drawButton2(current_menu->list->get(b).name); // draw normal
|
|
|
|
|
+ display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name);
|
|
|
current_menu->list->get(b).callable();
|
|
current_menu->list->get(b).callable();
|
|
|
}
|
|
}
|
|
|
display_obj.tft.setFreeFont(NULL);
|
|
display_obj.tft.setFreeFont(NULL);
|
|
@@ -413,7 +415,8 @@ void MenuFunctions::displayCurrentMenu()
|
|
|
display_obj.tft.setFreeFont(MENU_FONT);
|
|
display_obj.tft.setFreeFont(MENU_FONT);
|
|
|
for (int i = 0; i < current_menu->list->size(); i++)
|
|
for (int i = 0; i < current_menu->list->size(); i++)
|
|
|
{
|
|
{
|
|
|
- display_obj.key[i].drawButton2(current_menu->list->get(i).name);
|
|
|
|
|
|
|
+ //display_obj.key[i].drawButton2(current_menu->list->get(i).name);
|
|
|
|
|
+ display_obj.key[i].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(i).name);
|
|
|
|
|
|
|
|
if (current_menu->list->get(i).name != "Back")
|
|
if (current_menu->list->get(i).name != "Back")
|
|
|
display_obj.tft.drawXBitmap(0,
|
|
display_obj.tft.drawXBitmap(0,
|