From 92642d20483ab7b1d6762f344c363dd95871342e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 29 Oct 2019 10:22:38 +0100 Subject: [PATCH] Choice and Menu fixes --- radio/src/targets/horus/libopenui_config.h | 2 ++ radio/src/targets/nv14/libopenui_config.h | 2 ++ radio/src/thirdparty/libopenui | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index ada10f26f..a8aadd070 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -149,6 +149,8 @@ constexpr coord_t INPUT_EDIT_CURVE_WIDTH = 158; constexpr coord_t INPUT_EDIT_CURVE_HEIGHT = LCD_H - MENU_HEADER_HEIGHT; constexpr coord_t INPUT_EDIT_CURVE_LEFT = LCD_W - 158; constexpr coord_t INPUT_EDIT_CURVE_TOP = MENU_HEADER_HEIGHT; +constexpr coord_t MENUS_LINE_HEIGHT = 30; +constexpr uint8_t MENUS_MAX_LINES = 7; constexpr int CJK_FIRST_LETTER_INDEX = 187; diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index 06af5a446..317b0085a 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -147,6 +147,8 @@ constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W; constexpr coord_t INPUT_EDIT_CURVE_HEIGHT = 158; constexpr coord_t INPUT_EDIT_CURVE_LEFT = 0; constexpr coord_t INPUT_EDIT_CURVE_TOP = MENU_HEADER_HEIGHT; +constexpr coord_t MENUS_LINE_HEIGHT = 40; +constexpr uint8_t MENUS_MAX_LINES = 8; constexpr int CJK_FIRST_LETTER_INDEX = 187; diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 6865ad710..c018541f5 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 6865ad710f307cb5308f4994c4ae881940b98c7f +Subproject commit c018541f5d14259deff816279f219700a9462080