From 3e31f33b64a982900640dfe23c246d3b879ec274 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sat, 23 Aug 2014 21:36:21 +0200
Subject: [PATCH] Bug in menus scroll system (not needed in master)

---
 radio/src/gui/menus.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 3cef809e1..15c1c3480 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -598,22 +598,28 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
   else if (menuTab && horTab) {
     if (maxrow > LCD_LINES-1) {
       while (1) {
-        vertpos_t firstLine = s_pgOfs + (MAXCOL(vertpos_t(1)) == HIDDEN_ROW ? 2 : 1);
-        vertpos_t line = firstLine;
-        for (int numLines=0; line<=maxrow && numLines<LCD_LINES-1; line++) {
-          if (MAXCOL(line) != HIDDEN_ROW) {
+        vertpos_t firstLine = 0;
+        for (int numLines=0; firstLine<=maxrow && numLines<s_pgOfs; firstLine++) {
+          if (horTab[firstLine+1] != HIDDEN_ROW) {
             numLines++;
           }
         }
-        int max = line - firstLine;
-        if (l_posVert > max+firstLine-1) {
-          s_pgOfs++;
-        }
-        else if (l_posVert < firstLine) {
+        if (l_posVert <= firstLine) {
           s_pgOfs--;
         }
         else {
-          break;
+          vertpos_t lastLine = firstLine;
+          for (int numLines=0; lastLine<=maxrow && numLines<LCD_LINES-1; lastLine++) {
+            if (horTab[lastLine+1] != HIDDEN_ROW) {
+              numLines++;
+            }
+          }
+          if (l_posVert > lastLine) {
+            s_pgOfs++;
+          }
+          else {
+            break;
+          }
         }
       }
     }