sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge master into navigation-animations

Browse Source
This commit is contained in:
Patrick Horlebein
2020-04-17 09:38:16 +02:00
parent 330c4868c2 7dbc01bb0d
commit c851554d3e
13 changed files with 173 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,6 +264,8 @@ static void printShortDescription(uint32_t shortDescIndex,
// prepare cursor for value
OLED::setFont(0);
OLED::setCharCursor(cursorCharPosition, 0);
// make room for scroll indicator
OLED::setCursor(OLED::getCursorX() - 2, 0);
}
static int userConfirmation(const char *message) {
@@ -782,7 +784,8 @@ static void displayMenu(size_t index) {
OLED::print(SettingsMenuEntries[index]);
// Draw symbol
// 16 pixel wide image
OLED::drawArea(96 - 16, 0, 16, 16, (&SettingsMenuIcons[(16 * 2) * index]));
// 2 pixel wide scrolling indicator
OLED::drawArea(96 - 16 - 2, 0, 16, 16, (&SettingsMenuIcons[(16 * 2) * index]));
}
static void settings_displayCalibrateVIN(void) {
@@ -825,6 +828,11 @@ void gui_Menu(const menuitem *menu) {
ButtonState lastButtonState = BUTTON_NONE;
static bool enterGUIMenu = true;
enterGUIMenu = true;
uint8_t scrollContentSize = 0;
for (uint8_t i = 0; menu[i].draw.func != NULL; i++) {
scrollContentSize += 1;
}
// Animated menu opening.
if (menu[currentScreen].draw.func != NULL) {
@@ -851,6 +859,9 @@ void gui_Menu(const menuitem *menu) {
|| menu[currentScreen].description == NULL) {
OLED::clearScreen();
menu[currentScreen].draw.func();
uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize;
uint8_t position = currentScreen * indicatorHeight;
OLED::drawScrollIndicator(position, indicatorHeight);
lastOffset = -1;
lcdRefresh = true;
} else {