piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Another fix for the SF menu freeze bug

Browse Source
This commit is contained in:
Bertrand Songis
2016-04-05 09:48:58 +02:00
parent 7abcb28d11
commit 38c7d9c2a0
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/sdcard/horus/THEMES/TBS/main.lua
+5
View File
@@ -1,3 +1,5 @@
local bitmap = 0
local function load()
lcd.setColor(TEXT_COLOR_INDEX, WHITE)
lcd.setColor(TEXT_BGCOLOR_INDEX, BLACK)
@@ -24,11 +26,14 @@ local function load()
lcd.setColor(HEADER_ICON_BGCOLOR_INDEX, BLACK)
lcd.setColor(HEADER_CURRENT_BGCOLOR_INDEX, lcd.RGB(10, 78, 121))
lcd.setColor(OVERLAY_COLOR_INDEX, BLACK)
bitmap = lcd.loadBitmap("THEMES/TBS/thumb.bmp")
return 0
end
local function drawBackground()
lcd.drawFilledRectangle(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR);
lcd.drawBitmap(50, 50, bitmap)
end
local function drawTopbarBackground(icon)
radio/src/gui/horus/navigation.cpp
+7 -6
View File
@@ -323,7 +323,8 @@ int checkIncDec(evt_t event, int val, int i_min, int i_max, unsigned int i_flags
}
#define CURSOR_NOT_ALLOWED_IN_ROW(row) ((int8_t)MAXCOL(row) < 0)
#define MAXCOL_RAW(row) ((row) >= 0 && horTab ? pgm_read_byte(horTab+min<int>(row, (int)horTabMax)) : (const uint8_t)0)
#define HORTAB(row) (int8_t(row) > (int8_t)horTabMax ? horTab[horTabMax] : horTab[row])
#define MAXCOL_RAW(row) (horTab ? HORTAB(row) : (const uint8_t)0)
#define MAXCOL(row) (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE)))
#define COLATTR(row) (MAXCOL_RAW(row) == (uint8_t)-1 ? (const uint8_t)0 : (const uint8_t)(MAXCOL_RAW(row) & NAVIGATION_LINE_BY_LINE))
#define INC(val, min, max) if (val<max) {val++;} else if (max>min) {val=min;}
@@ -542,7 +543,7 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
if (horTab) {
linesCount = 0;
for (int i=0; i<rowcount; i++) {
if (i>horTabMax || horTab[i] != HIDDEN_ROW) {
if (HORTAB(i) != HIDDEN_ROW) {
linesCount++;
}
}
@@ -553,7 +554,7 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
while (1) {
int firstLine = 0;
for (int numLines=0; firstLine<rowcount && numLines<menuVerticalOffset; firstLine++) {
if (firstLine>=horTabMax || horTab[firstLine] != HIDDEN_ROW) {
if (HORTAB(firstLine) != HIDDEN_ROW) {
numLines++;
}
}
@@ -563,17 +564,17 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
else {
int lastLine = firstLine;
for (int numLines=0; lastLine<rowcount && numLines<linesDisplayed; lastLine++) {
if (lastLine >= horTabMax || horTab[lastLine] != HIDDEN_ROW) {
if (HORTAB(lastLine) != HIDDEN_ROW) {
numLines++;
}
}
if (menuVerticalPosition >= lastLine || ((firstLine <= horTabMax) && (horTab[firstLine] == ORPHAN_ROW))) {
if (menuVerticalPosition >= lastLine || HORTAB(firstLine) == ORPHAN_ROW) {
menuVerticalOffset++;
}
else {
linesCount = menuVerticalOffset + linesDisplayed;
for (int i=lastLine; i<rowcount; i++) {
if (i > horTabMax || horTab[i] != HIDDEN_ROW) {
if (HORTAB(i) != HIDDEN_ROW) {
linesCount++;
}
}