From 880ca3db6039296bf885265e3d556cfc4ec905c5 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 23 Feb 2021 10:44:51 +0100 Subject: [PATCH] Slide improved (keep the energy for multipages scroll) --- radio/src/targets/horus/libopenui_config.h | 6 ++---- radio/src/targets/nv14/libopenui_config.h | 6 ++---- radio/src/thirdparty/libopenui | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index 3ea472efe..f7bd79d14 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -28,6 +28,8 @@ typedef uint16_t pixel_t; +constexpr uint32_t SLIDE_SPEED_REDUCTION = 3; + constexpr uint32_t MENU_HEADER_BUTTON_WIDTH = 33; constexpr uint32_t MENU_HEADER_BUTTONS_LEFT = 47; @@ -41,10 +43,6 @@ constexpr uint32_t MENU_FOOTER_TOP = LCD_H - MENU_FOOTER_HEIGHT; constexpr uint32_t MENU_BODY_HEIGHT = MENU_FOOTER_TOP - MENU_BODY_TOP; constexpr uint32_t MENUS_MARGIN_LEFT = 6; -constexpr uint32_t DEFAULT_SCROLLBAR_X = LCD_W - 10; -constexpr uint32_t DEFAULT_SCROLLBAR_Y = MENU_CONTENT_TOP; -constexpr uint32_t DEFAULT_SCROLLBAR_H = MENU_FOOTER_TOP - DEFAULT_SCROLLBAR_Y - 6; - constexpr coord_t PAGE_PADDING = 6; constexpr uint32_t PAGE_LINE_HEIGHT = 20; constexpr uint32_t PAGE_LINE_SPACING = 2; diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index 9bb6d1c9d..82a2519db 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -29,6 +29,8 @@ typedef uint16_t pixel_t; +constexpr uint32_t SLIDE_SPEED_REDUCTION = 3; + constexpr uint32_t MENU_HEADER_BUTTON_WIDTH = 60; constexpr uint32_t MENU_HEADER_BUTTONS_LEFT = MENU_HEADER_BUTTON_WIDTH; @@ -42,10 +44,6 @@ constexpr uint32_t MENU_FOOTER_TOP = LCD_H - MENU_FOOTER_HEIGHT; constexpr uint32_t MENU_BODY_HEIGHT = MENU_FOOTER_TOP - MENU_BODY_TOP; constexpr uint32_t MENUS_MARGIN_LEFT = 6; -constexpr uint32_t DEFAULT_SCROLLBAR_X = LCD_W - 10; -constexpr uint32_t DEFAULT_SCROLLBAR_Y = MENU_CONTENT_TOP; -constexpr uint32_t DEFAULT_SCROLLBAR_H = MENU_FOOTER_TOP - DEFAULT_SCROLLBAR_Y - 6; - constexpr uint32_t PAGE_PADDING = 8; constexpr uint32_t PAGE_LINE_HEIGHT = 26; constexpr uint32_t PAGE_LINE_SPACING = 6; diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 1a003344e..b874eaa57 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 1a003344e9261cd42d7f8455fa049b67ddbcca5d +Subproject commit b874eaa57fbf4849e6aaa5b7ddd5060a39c01f8d