From e99e47aeac5e9af0662ea5c2bd860f8ad6a710e0 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 17 Dec 2016 23:15:34 +0100 Subject: [PATCH] [X7] Text view fix - #4143 --- radio/src/gui/128x64/view_text.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/128x64/view_text.cpp b/radio/src/gui/128x64/view_text.cpp index 6f386616c..9eaca8e29 100644 --- a/radio/src/gui/128x64/view_text.cpp +++ b/radio/src/gui/128x64/view_text.cpp @@ -88,6 +88,14 @@ void readTextFile(int & lines_count) } } +#if defined(PCBX7) +#define EVT_KEY_NEXT_LINE EVT_ROTARY_RIGHT +#define EVT_KEY_PREVIOUS_LINE EVT_ROTARY_LEFT +#else +#define EVT_KEY_NEXT_LINE EVT_KEY_FIRST(KEY_DOWN) +#define EVT_KEY_PREVIOUS_LINE EVT_KEY_FIRST(KEY_UP) +#endif + void menuTextView(event_t event) { static int lines_count; @@ -99,20 +107,18 @@ void menuTextView(event_t event) readTextFile(lines_count); break; - case EVT_KEY_FIRST(KEY_UP): + case EVT_KEY_PREVIOUS_LINE: if (menuVerticalOffset == 0) break; else menuVerticalOffset--; // no break; - case EVT_KEY_FIRST(KEY_DOWN): - // if (event == EVT_KEY_BREAK(KEY_DOWN)) { - if (menuVerticalOffset+LCD_LINES-1 >= lines_count) - break; - else - ++menuVerticalOffset; - // } + case EVT_KEY_NEXT_LINE: + if (menuVerticalOffset+LCD_LINES-1 >= lines_count) + break; + else + ++menuVerticalOffset; readTextFile(lines_count); break;