me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only play navigation animation when menus changed

Browse Source
This commit is contained in:
Patrick Horlebein
2020-04-06 17:39:05 +02:00
parent ec6140317c
commit bbb724e8f0
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workspace/TS100/Core/Src/gui.cpp
View File

@@ -823,6 +823,8 @@ void gui_Menu(const menuitem *menu) {
int16_t lastOffset = -1; int16_t lastOffset = -1;
bool lcdRefresh = true; bool lcdRefresh = true;
ButtonState lastButtonState = BUTTON_NONE; ButtonState lastButtonState = BUTTON_NONE;
static bool enterGUIMenu = true;
enterGUIMenu = true;
if (menu[currentScreen].draw.func != NULL) { if (menu[currentScreen].draw.func != NULL) {
uint8_t secondFrameBuffer[OLED_WIDTH * 2]; uint8_t secondFrameBuffer[OLED_WIDTH * 2];
@@ -882,14 +884,18 @@ void gui_Menu(const menuitem *menu) {
// increment // increment
if (descriptionStart == 0) { if (descriptionStart == 0) {
if (menu[currentScreen].incrementHandler.func != NULL) { if (menu[currentScreen].incrementHandler.func != NULL) {
enterGUIMenu = false;
menu[currentScreen].incrementHandler.func(); menu[currentScreen].incrementHandler.func();
// MARK: Might jump in submenu here
OLED::use_second_buffer(); if (enterGUIMenu) {
OLED::setFont(0); uint8_t secondFrameBuffer[OLED_WIDTH * 2];
OLED::setCursor(0, 0); OLED::set_framebuffer(secondFrameBuffer);
OLED::clearScreen(); OLED::setFont(0);
menu[currentScreen].draw.func(); OLED::setCursor(0, 0);
OLED::presentSecondScreenBufferAnimatedBack(); OLED::clearScreen();
menu[currentScreen].draw.func();
OLED::presentSecondScreenBufferAnimatedBack();
}
} else { } else {
earlyExit = true; earlyExit = true;
} }